aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-10-291-0/+7
|\
| * Bunch of fixes that reduce the number of times appearanceMaster ScienceSim2010-10-291-0/+7
| * Merge branch 'opensim-master' into dev-appearanceMaster ScienceSim2010-10-281-13/+29
| |\
* | \ Merge branch 'master' into careminster-presence-refactorMelanie2010-10-291-7/+0
|\ \ \
| * \ \ Merge branch 'dev-appearance'Melanie2010-10-291-7/+0
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a...Melanie2010-10-211-7/+0
| | |\ \ | | | |/
| | | * Major refactoring of appearance handling.Master ScienceSim2010-10-201-7/+0
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-271-9/+27
|\ \ \ \ | |/ / /
| * | | Overload Scene.NewUserConnection() to facilitate NPCs and other region specif...dahlia2010-10-261-9/+27
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-10-221-3/+3
| |\ \ \
| | * | | Change some exception to use ToString(). e.Message is not sufficient to fixMelanie2010-10-221-3/+3
| * | | | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-221-4/+1
| |/ / /
| * | | Merge branch 'hg16' into mantis5110Jonathan Freedman2010-10-221-1/+4
| |\ \ \
| | * | | * change the data exchanged within hypergrid transactionsJonathan Freedman2010-10-211-1/+4
| | | |/ | | |/|
| * | | Make SImStatsReporter pick ObjectCapacity striaght out of region infoMelanie2010-10-221-2/+0
| |/ /
* | | Change some exception to use ToString(). e.Message is not sufficient to fixMelanie2010-10-221-3/+3
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-211-2/+0
|\ \ \ | | |/ | |/|
| * | Make SImStatsReporter pick ObjectCapacity striaght out of region infoMelanie2010-10-211-2/+0
| |/
| * Plumb the path for multiple object deletesMelanie2010-10-061-2/+2
* | Make SendKillObject send multiple localIDs in one packet. This avoids theMelanie2010-10-081-10/+16
* | Implement taking of coalesced objects.Melanie2010-10-071-0/+9
* | Plumb the path for multiple object deletesMelanie2010-10-061-2/+2
* | Enforce region agent limit as set in estate toolsMelanie2010-09-301-0/+8
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-171-9/+5
|\ \ | |/
| * Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndA...John Hurliman2010-09-161-9/+5
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-161-1/+1
|\ \ | |/
| * rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve co...Justin Clark-Casey (justincc)2010-09-151-1/+1
* | 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
|\ \