aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* reorder some code to avoid merge issues in the futureMelanie2010-09-141-5/+5
* Fix merge issuesMelanie2010-09-141-3/+0
* Merge branch 'master' into careminster-presence-refactorMelanie2010-09-141-0/+7
|\
| * minor: Add comments which explain what's going on wrt avatar movements at var...Justin Clark-Casey (justincc)2010-09-131-0/+4
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-131-203/+226
|\ \ | |/
| * MergedJohn Hurliman2010-09-121-7/+7
| |\
| | * Formatting cleanup.Jeff Ames2010-09-121-9/+9
| * | * Added ISimulationDataService and IEstateDataServiceJohn Hurliman2010-09-121-31/+71
| |/
| * Shuffling fields and properties around in Scene to make Scene.cs more readableJohn Hurliman2010-09-111-138/+124
| * Made it impossible to create a user with names containing spaces and prevente...randomhuman2010-09-101-2/+3
| * First pass at cleaning up thread safety in EntityManager and SceneGraphJohn Hurliman2010-09-101-24/+21
| * Fix deletion persistence when freshly delinked prims are removedJustin Clark-Casey (justincc)2010-09-071-9/+16
* | Make AddRestoredSceneObject reset the IsDeleted flag so we can take anMelanie Thielker2010-09-081-1/+4
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-071-13/+24
|\ \
| * | Fix deletion persistence when freshly delinked prims are removedJustin Clark-Casey (justincc)2010-09-071-9/+16
| |/
| * Make console backup command do a forced backup rather than non-forcedJustin Clark-Casey (justincc)2010-09-061-5/+0
| * Add test to check persistence of newly added pre-linked objectsJustin Clark-Casey (justincc)2010-09-061-2/+11
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-051-0/+2
|\ \ | |/
| * Logout the presence if client IP verification fails.Diva Canto2010-09-041-0/+2
| * Adjust the "Magic numbers" we use because we can't reference the actualMelanie Thielker2010-08-311-1/+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
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie Thielker2010-08-311-2/+3
|\ \
| * \ Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...meta72010-08-301-21/+77
| |\ \
| * | | Kick the user from the region in the circumstance that the TP home failed - O...meta72010-08-301-2/+3
* | | | Adjust the "Magic numbers" we use because we can't reference the actualMelanie Thielker2010-08-311-1/+1
| |/ / |/| |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-301-22/+11
|\ \ \ | | |/ | |/|
| * | Improve liveness by operating on list copies of SOG.Children where appropriateJustin Clark-Casey (justincc)2010-08-281-10/+11
| * | Remove mono compiler warningsJustin Clark-Casey (justincc)2010-08-261-12/+0
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-261-14/+20
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-261-1/+0
| |\ \
| * | | Improve consistency of locking for SOG.m_parts in order to avoid race conditi...Justin Clark-Casey (justincc)2010-08-261-15/+20
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-251-2/+18
|\ \ \ \ | | |/ / | |/| |
| * | | Make scene object directories more robust and prevent deleted SOP's fromMelanie Thielker2010-08-251-1/+0
| |/ /
| * | Split out actual scene object insertion code from Scene.Inventory.RezObject a...Justin Clark-Casey (justincc)2010-08-241-1/+17
* | | Change object cleanup again. Make scene object directories more robust andMelanie Thielker2010-08-251-2/+1
* | | Correct a logic error in attachment cleanupMelanie Thielker2010-08-251-4/+9
* | | Lock the attachment cleanup so it doesn't go into an endless deletion frenzyMelanie Thielker2010-08-251-16/+20
* | | Call the cleanup after saving attachment states, so that the attachmentsMelanie Thielker2010-08-241-1/+3
* | | Call the Cleanup when an agent logs out, when an agent leaves and justMelanie Thielker2010-08-241-0/+3
* | | Add a method to delete left over / dropped attachmentsMelanie Thielker2010-08-241-0/+32
| |/ |/|
* | Add printing the default script engine name. Report real exceptions whenMelanie Thielker2010-08-221-2/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-211-48/+47
|\ \ | |/
| * Cleaned up a few more things related to incoming agents.Diva Canto2010-08-201-45/+42
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-201-25/+27
| |\
| | * Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on myipaddress.c...Diva Canto2010-08-191-25/+27
| * | Add some maptile options, change maptile generation from OpenSimBase to SceneMelanie2010-08-201-9/+54
| |/
* | Add some maptile options, change maptile generation from OpenSimBase to SceneMelanie Thielker2010-08-201-8/+53
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-181-375/+11
|\ \ | |/
| * Updated the create_region command in the RemoteAdmin plugin to properly suppo...randomhuman2010-08-131-39/+0