 Melanie
|
75c68fa29e
Merge branch 'master' into careminster
|
11 years ago |
 Aleric Inglewood
|
2dc92e7de1
Preserve attachment point & position when attachment is rezzed in world
|
11 years ago |
|
Melanie
|
069e587841
Merge branch 'master' into careminster
|
11 years ago |
 Oren Hurvitz
|
745ef40153
Fixed ReadSculptData(): the check whether there are enough bytes to read was incorrect
|
11 years ago |
|
Melanie
|
2cb824d3fc
Merge branch 'master' into careminster
|
12 years ago |
 Justin Clark-Casey (justincc)
|
0f3ebe0971
Remove very probably unused PrimitiveBaseShape(bool) constructor to reduce code complexity
|
12 years ago |
|
Justin Clark-Casey (justincc)
|
b60c6bc3f8
Don't pointlessly set ExtraParams = byte[1] in PrimitiveBaseShape since this is ignored by the ExtraParams properly anyway
|
12 years ago |
|
Melanie
|
df7abbb367
Merge branch 'master' into careminster
|
12 years ago |
 dahlia
|
4032455332
add a null check for Primitive.Sculpt in PrimitiveBaseShape constructor for OpenMetaverse.Primitive object
|
12 years ago |
 UbitUmarov
|
2e41294da9
add convex state to mesh key, so a change is detected.
|
12 years ago |
 Tom
|
66dec3b874
Resolve merge commits, stage 1
|
13 years ago |
 Robert Adams
|
18037d41c4
Move GetMeshKey from buried inside Meshmerizer to a public method on PrimitiveBaseShape
|
13 years ago |
 root
|
c920ff9d1d
Merge branch 'master' into careminster-presence-refactor
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
d79c6c8820
Rename SetSculptData() to SetSculptProperties(), since this is what it does (setting SculptData is done through the property)
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
5e8900dfd0
minor: code tidy and inserted log lines for future use.
|
13 years ago |
|
Melanie
|
9165a5207d
Merge branch 'master' into careminster-presence-refactor
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
9f85ee29ac
Change MoapModule.ClearMediaEntry to set TextureEntryFace.MediaFlags back to false
|
13 years ago |
|
Melanie
|
e4bb8dc385
Guard against invalid light color specifiers from the database
|
14 years ago |
|
Melanie
|
bb7a755cba
Merge branch 'master' into careminster-presence-refactor
|
14 years ago |
 BlueWall
|
06b61b68c7
Adding osFunctions for light projection
|
14 years ago |
|
BlueWall
|
9e421868e3
Add missing check for !_projectionEntry
|
14 years ago |
|
Melanie
|
455a2ba7de
Merge branch 'master' into careminster-presence-refactor
|
14 years ago |
|
BlueWall
|
dd1058e6b3
Adding projected light filters to prim propeties
|
14 years ago |
|
Melanie
|
6a1ce17cdb
Merge branch 'master' into careminster-presence-refactor
|
14 years ago |
 Jeff Ames
|
f1f0bc23f4
Formatting cleanup.
|
14 years ago |
|
Melanie
|
26387252f5
Merge branch 'master' into careminster-presence-refactor
|
14 years ago |
|
Justin Clark-Casey (justincc)
|
99c0f4c9c7
Simplify serialized version string. Change element capitalization for consistency
|
14 years ago |
|
Justin Clark-Casey (justincc)
|
9d8a67fe13
get rid of PrimitiveBaseShape.MediaRaw staging post
|
14 years ago |
|
Justin Clark-Casey (justincc)
|
ac07d853b8
remove duplicated serialization code
|
14 years ago |
|
Justin Clark-Casey (justincc)
|
60df76314f
serialize media textures to inventory with a largely osd representation rather than .net auto-serialization
|
14 years ago |
