aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-09-253-3/+10
|\
| * Add UUID to physics prim name parameter so that diagnostic messages can be ma...Justin Clark-Casey (justincc)2010-09-252-3/+3
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-251-10/+0
| |\
| * | If the uuid gatherer fails to find the asset containing gesture metadata, the...Justin Clark-Casey (justincc)2010-09-241-0/+7
* | | if you can't edit a prim's inventory, you don't need to see the asset ids.Melanie2010-09-241-1/+8
* | | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-09-211-1/+1
|\ \ \
| * | | Refactor script create permission into the perms moduleMelanie2010-09-211-10/+0
| * | | Fix a merge artefact that broke script state persistence in XAttachmentsMelanie2010-09-191-1/+1
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-213-12/+41
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-09-212-2/+41
| |\ \ | | |/
| | * If the uuid of a SceneObjectGroup (RootPart) is changed before adding to the ...Justin Clark-Casey (justincc)2010-09-212-2/+41
| * | Refactor script create permission into the perms moduleMelanie2010-09-211-10/+0
| |/
* | Remove the now unused partslockroot2010-09-171-1/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-1712-1027/+653
|\ \ | |/
| * Fixed a regression in SOG.Copy()John Hurliman2010-09-161-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-09-162-1/+29
| |\
| | * Fix build break by replacing Items.LockItemsForWrite() with lock (Items) {}Justin Clark-Casey (justincc)2010-09-171-22/+21
| | * Removing debugroot2010-09-161-1/+0
| | * JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.root2010-09-163-1/+31
| * | Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndA...John Hurliman2010-09-1612-943/+682
| |/
* | Removing debugroot2010-09-161-1/+0
* | JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.root2010-09-163-1/+31
* | Some small bug fixesroot2010-09-162-1/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-163-13/+10
|\ \ | |/
| * rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve co...Justin Clark-Casey (justincc)2010-09-153-3/+3
| * Instead of locking SOG.Children when a group is being removed from the scene,...Justin Clark-Casey (justincc)2010-09-151-15/+17
* | Don't fart when deserializing a prim with no ParentGroup set yetmeta72010-09-151-1/+5
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie Thielker2010-09-144-22/+18
|\ \
| * | reorder some code to avoid merge issues in the futureMelanie2010-09-141-5/+5
| * | Fix merge issuesMelanie2010-09-142-5/+2
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-144-15/+14
| |\ \ | | |/
| | * Comment out SOG storing debug log messageJustin Clark-Casey (justincc)2010-09-141-3/+3
| | * minor: Add comments which explain what's going on wrt avatar movements at var...Justin Clark-Casey (justincc)2010-09-132-0/+6
| | * Remove SceneGraph.DetachObject() which was accidentally left around after bei...Justin Clark-Casey (justincc)2010-09-131-10/+0
| | * minor: Clean up log messages generated when an item is attachedJustin Clark-Casey (justincc)2010-09-131-9/+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-1318-690/+541
|\ \ | |/
| * MergedJohn Hurliman2010-09-1216-72/+99
| |\
| | * Formatting cleanup.Jeff Ames2010-09-1216-74/+74
| | * Add copyright headers.Jeff Ames2010-09-121-0/+27
| * | * Added ISimulationDataService and IEstateDataServiceJohn Hurliman2010-09-125-37/+77
| |/
| * Shuffling fields and properties around in Scene to make Scene.cs more readableJohn Hurliman2010-09-111-138/+124
| * Fixed the naming mess around data connectors for simulation dataJohn Hurliman2010-09-113-4/+4
| * Made it impossible to create a user with names containing spaces and prevente...randomhuman2010-09-101-2/+3
| * Second pass at cleaning up thread safety in EntityManager and SceneGraphJohn Hurliman2010-09-103-58/+35
| * First pass at cleaning up thread safety in EntityManager and SceneGraphJohn Hurliman2010-09-107-344/+219
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-083-3/+10
| |\
| | * * Cache null account responses in the SimianUserAccountServiceConnector to av...John Hurliman2010-09-071-1/+3
| * | If a scene object part UUID is changed (only possible when not in a scene), t...Justin Clark-Casey (justincc)2010-09-072-2/+11