aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-251-1/+1
|\ \ | |/
| * Add UUID to physics prim name parameter so that diagnostic messages can be ma...Justin Clark-Casey (justincc)2010-09-251-1/+1
* | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-09-211-1/+1
|\ \
| * | Fix a merge artefact that broke script state persistence in XAttachmentsMelanie2010-09-191-1/+1
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-211-2/+6
|\ \ \ | |/ / |/| / | |/
| * If the uuid of a SceneObjectGroup (RootPart) is changed before adding to the ...Justin Clark-Casey (justincc)2010-09-211-2/+6
* | Remove the now unused partslockroot2010-09-171-1/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-171-899/+561
|\ \ | |/
| * Fixed a regression in SOG.Copy()John Hurliman2010-09-161-1/+1
| * Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndA...John Hurliman2010-09-161-818/+591
* | Removing debugroot2010-09-161-1/+0
* | JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.root2010-09-161-0/+1
* | Some small bug fixesroot2010-09-161-0/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-161-11/+8
|\ \ | |/
| * rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve co...Justin Clark-Casey (justincc)2010-09-151-1/+1
| * Instead of locking SOG.Children when a group is being removed from the scene,...Justin Clark-Casey (justincc)2010-09-151-15/+17
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie Thielker2010-09-141-3/+3
|\ \
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-09-141-3/+3
| |\ \ | | |/
| | * Comment out SOG storing debug log messageJustin Clark-Casey (justincc)2010-09-141-3/+3
* | | Adjust the code for ghost prim removal to new information from KittoMelanie Thielker2010-09-141-3/+7
|/ /
* | Fix a small left over buglet and also add checking of the physics actorMelanie Thielker2010-09-141-0/+10
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-131-16/+7
|\ \ | |/
| * MergedJohn Hurliman2010-09-121-9/+9
| |\
| | * Formatting cleanup.Jeff Ames2010-09-121-9/+9
| * | * Added ISimulationDataService and IEstateDataServiceJohn Hurliman2010-09-121-1/+1
| |/
| * Fixed the naming mess around data connectors for simulation dataJohn Hurliman2010-09-111-1/+1
| * Second pass at cleaning up thread safety in EntityManager and SceneGraphJohn Hurliman2010-09-101-9/+2
| * Fix deletion persistence when freshly delinked prims are removedJustin Clark-Casey (justincc)2010-09-071-17/+25
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-071-15/+27
|\ \
| * | Fix deletion persistence when freshly delinked prims are removedJustin Clark-Casey (justincc)2010-09-071-17/+25
| |/
| * Add test to check persistence of newly added pre-linked objectsJustin Clark-Casey (justincc)2010-09-061-3/+2
| * refactor: move SOG.AttachToAgent() into AttachmentsModuleJustin Clark-Casey (justincc)2010-09-011-71/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-301-23/+26
|\ \ | |/
| * Improve liveness by operating on list copies of SOG.Children where appropriateJustin Clark-Casey (justincc)2010-08-281-23/+27
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-261-40/+71
|\ \ | |/
| * replace m_parts.Count linknum with 0 in CopyRootPart since m_parts.Count is a...Justin Clark-Casey (justincc)2010-08-261-1/+1
| * Improve consistency of locking for SOG.m_parts in order to avoid race conditi...Justin Clark-Casey (justincc)2010-08-261-52/+79
| * If setting SOG.UUID, update the SOG.m_parts index as well as the root part UUIDJustin Clark-Casey (justincc)2010-08-251-1/+10
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-181-3/+3
|\ \ | |/
| * refactor: Use SOP.Flags rather than SOP.ObjectFlagsJustin Clark-Casey (justincc)2010-08-131-3/+3
* | Note to self: don't break the buildmeta72010-08-101-1/+1
* | Resolve merge failuremeta72010-08-101-4/+23
|\ \
| * | Resolve merge issuesMelanie2010-08-101-22/+46
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-101-29/+24
| |\ \ | | |/
| | * Removed abstract SetText method from EntityBase to make cleaner API.Mikko Pallari2010-08-101-1/+1
| | * On shift-copy of an object, set up a new physics actor (as appropriate) for e...Justin Clark-Casey (justincc)2010-08-101-19/+19
| * | Remove windows line endingeMelanie2010-08-101-104/+104
* | | Add a stack trace to the error output on the recursive read lock warning on m...meta72010-08-101-104/+114
|/ /
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-081-2/+2
|\ \ | |/
| * minor: Remove overly verbose schedule full update log message for attachmentsJustin Clark-Casey (justincc)2010-08-071-2/+2