aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Make AddRestoredSceneObject reset the IsDeleted flag so we can take anMelanie Thielker2010-09-081-1/+4
* | | Fix some issues with unlinkingMelanie Thielker2010-09-071-56/+53
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-071-0/+2
|\ \ \ | | |/ | |/|
| * | Make sure unlinked child prims get persistedMelanie2010-09-071-0/+5
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-0711-58/+163
|\ \ \ | |/ /
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-09-071-2/+2
| |\ \ | | |/
| | * minor: comment out some excessive test loggingJustin Clark-Casey (justincc)2010-09-071-1/+1
| | * Fix deletion persistence when freshly delinked prims are removedJustin Clark-Casey (justincc)2010-09-076-42/+58
| * | Fix deletion persistence when freshly delinked prims are removedJustin Clark-Casey (justincc)2010-09-076-42/+58
| |/
| * Add test that checks correct persistence when an unlink is quickly followed b...Justin Clark-Casey (justincc)2010-09-061-9/+40
| * Make console backup command do a forced backup rather than non-forcedJustin Clark-Casey (justincc)2010-09-062-6/+1
| * extend TestNewSceneObjectLinkPersistence() to check for presence of non-root ...Justin Clark-Casey (justincc)2010-09-061-2/+3
| * Add test to check persistence of newly added pre-linked objectsJustin Clark-Casey (justincc)2010-09-067-21/+78
| * Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, becauseMelanie Thielker2010-09-061-1/+25
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Kitto Flora2010-09-066-29/+91
|\ \
| * | Don't turn off the sale settings on child prims when linking, and on copyMelanie Thielker2010-09-061-8/+0
| * | Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, becauseMelanie Thielker2010-09-061-1/+25
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-052-18/+43
| |\ \ | | |/
| | * Logout the presence if client IP verification fails.Diva Canto2010-09-041-0/+2
| | * Move code that allows llGiveInvetory() to move item into appropriate system f...Justin Clark-Casey (justincc)2010-09-041-8/+40
| | * Create Scene.Inventory.cs.AddInventoryItem(InventoryItemBase item)Justin Clark-Casey (justincc)2010-09-041-8/+27
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-031-0/+21
| |\ \ | | |/
| | * Fix an issue with rezzing scripted objects.Melanie Thielker2010-09-031-2/+2
| | * Remove commented code and the comment, as the change has proven outMelanie Thielker2010-09-021-3/+0
| | * Experimentally comment the sending of unbaked avatarsMelanie Thielker2010-09-021-1/+3
| | * refactor: move SOG.AttachToAgent() into AttachmentsModuleJustin Clark-Casey (justincc)2010-09-011-71/+0
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-013-3/+3
| | |\
| | | * Adjust the "Magic numbers" we use because we can't reference the actualMelanie Thielker2010-08-313-3/+3
| | * | Add ScenePresence.GetAttachments(uint attachmentPoint)Justin Clark-Casey (justincc)2010-08-311-0/+21
| | |/
| * | Fix an issue with rezzing scripted objects.Melanie Thielker2010-09-031-2/+2
* | | Falling animation fix, comment out instrumentation.Kitto Flora2010-09-062-40/+61
|/ /
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Kitto Flora2010-09-024-19/+7
|\ \
| * | Remove commented code and the comment, as the change has proven outMelanie Thielker2010-09-021-3/+0
| * | Experimentally comment the sending of unbaked avatarsMelanie Thielker2010-09-021-1/+3
| * | Remove the annoying "Script saved" popups when saving scripts in taskMelanie Thielker2010-09-021-13/+1
| * | Prevent Meta7 plants from being treated like dropped attachments and removedMelanie Thielker2010-09-011-1/+1
| * | Improve sim health reporting. Output error message if heartbeat thread is res...Melanie Thielker2010-09-011-1/+2