aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/PrimitiveBaseShape.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* keep the reverted code, that does work. Our code likes to have pbs.Media == ↵UbitUmarov2017-06-081-15/+28
| | | | null when there is no MOAD defined, so handle possible odd oars that may have llsd <array /> on that case
* move mesh pbs creation code out of mesh upload code into to ↵UbitUmarov2017-04-251-0/+64
| | | | PrimitiveBaseShape.cs
* Massive tab and trailing space cleanupMelanie Thielker2017-01-051-2/+2
|
* Merge branch 'master' into careminsterMelanie2013-10-041-0/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Preserve attachment point & position when attachment is rezzed in worldAleric Inglewood2013-09-221-0/+11
| | | | | | | | | | | | | | | | | | | | Patch taken from http://opensimulator.org/mantis/view.php?id=4905 originally by Greg C. Fixed to apply to r/23314 commit ba9daf849e7c8db48e7c03e7cdedb77776b2052f (cherry picked from commit 4ff9fbca441110cc2b93edc7286e0e9339e61cbe)
* | Merge branch 'master' into careminsterMelanie2013-02-101-5/+6
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations
| * Fixed ReadSculptData(): the check whether there are enough bytes to read was ↵Oren Hurvitz2013-02-091-5/+6
| | | | | | | | incorrect
* | Merge branch 'master' into careminsterMelanie2012-12-071-15/+6
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Remove very probably unused PrimitiveBaseShape(bool) constructor to reduce ↵Justin Clark-Casey (justincc)2012-12-051-12/+6
| | | | | | | | code complexity
| * Don't pointlessly set ExtraParams = byte[1] in PrimitiveBaseShape since this ↵Justin Clark-Casey (justincc)2012-12-051-3/+0
| | | | | | | | is ignored by the ExtraParams properly anyway
* | Merge branch 'master' into careminsterMelanie2012-05-071-4/+8
|\ \ | |/
| * add a null check for Primitive.Sculpt in PrimitiveBaseShape constructor for ↵dahlia2012-05-071-4/+8
| | | | | | | | OpenMetaverse.Primitive object
* | add convex state to mesh key, so a change is detected.UbitUmarov2012-03-211-0/+8
| |
* | Resolve merge commits, stage 1Tom2011-09-041-0/+61
|\ \ | |/
| * Move GetMeshKey from buried inside Meshmerizer to a public method on ↵Robert Adams2011-08-281-0/+61
| | | | | | | | | | | | PrimitiveBaseShape Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Merge branch 'master' into careminster-presence-refactorroot2011-07-091-16/+32
|\ \ | |/
| * Rename SetSculptData() to SetSculptProperties(), since this is what it does ↵Justin Clark-Casey (justincc)2011-07-091-1/+1
| | | | | | | | (setting SculptData is done through the property)
| * minor: code tidy and inserted log lines for future use.Justin Clark-Casey (justincc)2011-07-091-15/+31
| | | | | | | | | | | | | | | | Unable to get to the bottom of why resizing a mesh fails to properly reset the physics proxy, when toggling phantom does After a mesh is generated, the existing sculptdata is set to zero in PrimitiveBaseShape to save memory When phantom is toggled, the sculptdata is regenerated before remeshing. But on resize, the sculptdata is not regenerated. So clearly, resetting sculptdata is possible, but haven't quite been able to pin down how this is being done when phantom is toggled.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-101-1/+1
|\ \ | |/
| * Change MoapModule.ClearMediaEntry to set TextureEntryFace.MediaFlags back to ↵Justin Clark-Casey (justincc)2011-03-051-1/+1
| | | | | | | | | | | | false Implement test for ClearMediaEntry()
* | Guard against invalid light color specifiers from the databaseMelanie2011-01-131-4/+24
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-181-6/+51
|\ \ | |/
| * Adding osFunctions for light projectionBlueWall2010-10-171-5/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the projection parameters in the host prim ... osSetProjectionParam(bool Enabled, key TextureMaskUUID, float FOV, float Focus, float Ambiance); Set the projection parameters in a target prim ... osSetProjectionParam(ikey target uuid, bool Enabled, key TextureMaskUUID, float FOV, float Focus, float Ambiance); Threat Level very high Signed-off-by: Melanie <melanie@t-data.com>
| * Add missing check for !_projectionEntryBlueWall2010-10-161-1/+1
| | | | | | | | Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-161-0/+80
|\ \ | |/
| * Adding projected light filters to prim propetiesBlueWall2010-10-151-0/+80
| | | | | | | | | | Requires the LL Mesh Beta viewer Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-131-37/+37
|\ \ | |/ | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on.
| * Formatting cleanup.Jeff Ames2010-09-121-37/+37
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-061-2/+113
|\ \ | |/
| * Simplify serialized version string. Change element capitalization for ↵Justin Clark-Casey (justincc)2010-08-031-5/+10
| | | | | | | | | | | | | | consistency THIS CHANGE ALTERS THE SERIALIZATION FORMAT, HOPEFULLY FOR THE LAST TIME. If you're testing, please start with a new database. This commit also improves locking for manipulation of media entries.
| * get rid of PrimitiveBaseShape.MediaRaw staging postJustin Clark-Casey (justincc)2010-08-031-6/+0
| | | | | | | | | | using an OSD serialization rather than auto forces serialization code to be placed in OpenSim.Framework this makes the media texture raw data staging post in PrimitiveBaseShape redundant, now we just directly call the code in PrimitiveBaseShape.MediaList itself
| * remove duplicated serialization codeJustin Clark-Casey (justincc)2010-08-031-12/+26
| |
| * serialize media textures to inventory with a largely osd representation ↵Justin Clark-Casey (justincc)2010-08-031-3/+87
| | | | | | | | | | | | | | rather than .net auto-serialization THIS WILL BREAK ANY EXISTING MEDIA TEXTURE SERIALIZATIONS. If you're testing this, please start with new databases. This makes media textures serialized in the same way, which is probably better in the long term.
| * relocate serialization code from SQLiteRegionData to MoapModule using load ↵Justin Clark-Casey (justincc)2010-07-261-0/+6
| | | | | | | | | | | | | | | | | | | | and save events. This is better modularity. It also allows MoapModule to be replaced with some other media module that may behave completely differently in the future. Remaining non-modularity: PrimitiveBaseShape needs explicit Media and MediaRaw fields. MediaRaw is required in order to shuttle the pre-serialization data back and forth from the database layer. The database also needs to know about MediaRaw though not about Media. IMO, it would be extremely nice to remove these hard codings but this is a bridge too far at the present time.
| * implement llSetPrimMediaParams()Justin Clark-Casey (justincc)2010-07-261-0/+1
| | | | | | | | Untested
| * start storing incoming MediaEntry on a new Media field on PrimitiveBaseShapeJustin Clark-Casey (justincc)2010-07-261-0/+7
| | | | | | | | | | This allows the media texture to persist in memory - logging in and out will redisplay it (after a click) though navigation will be lost Next need to implement media uri on prim and delegate more incoming llsd parsing to libomv
* | Make newly created prims be named "Object" and make newly created scriptsMelanie Thielker2010-06-291-1/+1
|/ | | | have a default touch handler. Compatibility patch
* * Thanks cmickeyb, for a patch that corrects an invalid construction of ↵John Hurliman2010-04-271-1/+1
| | | | Primitive.TextureEntry (a "blank" texture should be initialized with UUID.Zero, not null)
* * Added 32bitLauncher for Robust. Still need to test it on a 64 bit machine.Diva Canto2010-04-141-3/+3
| | | | * PrimitiveBaseShape wants to be be committed too -- EOF.
* minor - add some documentation to PrimitiveBaseShape constructor with ↵dahlia2010-04-091-0/+4
| | | | OpenMetaverse.Primitive parameter
* Fixed several unhandled exceptions and performance issues with ↵John Hurliman2010-03-161-2/+6
| | | | PrimitiveBaseShape.Textures. This really should be moved from a property to a method if it is going to decode a byte[] into a TextureEntry each time
* More work on GrantRights. Still not right.Diva Canto2010-03-011-34/+34
|
* minor formatting tweak - try to trigger a build on pandadahlia2010-02-221-1/+0
|
* add a constructor for PrimitiveBaseShape from a OpenMetaverse Primitivedahlia2010-02-221-0/+35
|
* remove early return from PrimitiveBaseShape.ToOmvPrimitive() when prim is a ↵dahlia2009-11-201-2/+0
| | | | sculpty
* Correct formatting of Primitive.Textures in ↵dahlia2009-11-171-1/+1
| | | | PrimitiveBaseShape.ToOmvPrimitive method
* Some corrections to PrimitiveBaseShape.ToOmvPrimitive()dahlia2009-11-131-6/+26
|
* add a ToOmvPrimitive() method to PrimitiveBaseShapedahlia2009-11-111-0/+81
|
* Changing Scene.ForEachClient to use the synchronous for loop instead of ↵John Hurliman2009-10-251-41/+25
| | | | | | | | | | Parallel. This is quite possibly the source of some deadlocking, and at the very least the synchronous version gives better stack traces * Lock the LLUDPClient RTO math * Add a helper function for backing off the RTO, and follow the optional advice in RFC 2988 to clear existing SRTT and RTTVAR values during a backoff * Removing the unused PrimitiveBaseShape.SculptImage parameter * Improved performance of SceneObjectPart instantiation * ZeroMesher now drops SculptData bytes like Meshmerizer, to allow the texture data to be GCed * Improved typecasting speed in MySQLLegacyRegionData.BuildShape() * Improved the instantiation of PrimitiveBaseShape
* add some more intuitive overloads for PrimitiveBaseShape SetPathRange and ↵Dahlia Trimble2009-07-011-0/+12
| | | | SetProfileRange
generated by cgit v1.1 at 2024-11-16 16:18:55 +0000