aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵Melanie2010-10-211-7/+0
| | |\ | | | | | | | | | | | | dev-appearance
| | | * Major refactoring of appearance handling.Master ScienceSim2010-10-201-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AvatarService -- add two new methods, GetAppearance and SetAppearance to get around the lossy encoding in AvatarData. Preseve the old functions to avoid changing the behavior for ROBUST services. AvatarAppearance -- major refactor, moved the various encoding methods used by AgentCircuitData, ClientAgentUpdate and ScenePresence into one location. Changed initialization. AvatarAttachments -- added a class specifically to handle attachments in preparation for additional functionality that will be needed for viewer 2. AvatarFactory -- removed a number of unused or methods duplicated in other locations. Moved in all appearance event handling from ScenePresence. Required a change to IClientAPI that propogated throughout all the IClientAPI implementations.
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-271-9/+27
|\ \ \ \ | |/ / /
| * | | Overload Scene.NewUserConnection() to facilitate NPCs and other region ↵dahlia2010-10-261-9/+27
| | | | | | | | | | | | | | | | specific applications
| * | | 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
| | | | | | | | | | | | | | | | | | | | errors. Please don't use e.Message, devs NEED to see the dumps!
| * | | | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-221-4/+1
| |/ / / | | | | | | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
| * | | 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
| | | | | | | | | | | | errors. Please don't use e.Message, devs NEED to see the dumps!
* | | 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
| | | | | | | | halting visual behavior of large group deletes and eliminates the packet flood
* | Implement taking of coalesced objects.Melanie2010-10-071-0/+9
| | | | | | | | | | | | | | WARNING!!!!! You can TAKE them, but you can't REZ them again. Only the first of the contained objects will rez, the rest is inaccessible until rezzing them is implemented. Also, rotations are not explicitly stored. This MAY work. Or not.
* | 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
|\ \ | |/ | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it.
| * Changed SceneObjectGroup to store parts with the fast and thread-safe ↵John Hurliman2010-09-161-9/+5
| | | | | | | | MapAndArray collection
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-161-1/+1
|\ \ | |/
| * rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve ↵Justin Clark-Casey (justincc)2010-09-151-1/+1
| | | | | | | | code readability
* | 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 ↵Justin Clark-Casey (justincc)2010-09-131-0/+4
| | | | | | | | various points in the main scene loop and associated methods
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-131-203/+226
|\ \ | |/ | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on.
| * MergedJohn Hurliman2010-09-121-7/+7
| |\
| | * Formatting cleanup.Jeff Ames2010-09-121-9/+9
| | |
| * | * Added ISimulationDataService and IEstateDataServiceJohn Hurliman2010-09-121-31/+71
| |/ | | | | | | | | * Removed StorageManager * CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings
| * 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 ↵randomhuman2010-09-101-2/+3
| | | | | | | | prevented passwords from being echoed after enter is pressed.
| * 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
| | | | | | | | | | | | | | | | | | | | Previously, Scene.Inventory.DeRezObjects() forced the persistence of prims before deletion. This is necessary so that freshly delinked prims can be deleted (otherwise they remain as parts of their old group and reappear on server restart). However, DeRezObjects() deleted to user inventory, which is required by llDie() or direct region module unlink and deletion. Therefore, forced persistence has been pushed down into Scene.UnlinkSceneObject() to be more general, this is still on the DeRezObjects() path. Uncommented TestDelinkPersistence() since this now passes. Tests required considerable elaboration of MockRegionDataPlugin to reflect underlying storing of parts.
* | Make AddRestoredSceneObject reset the IsDeleted flag so we can take anMelanie Thielker2010-09-081-1/+4
| | | | | | | | object out of the scene and then put it back in.
* | 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
| |/ | | | | | | | | | | | | | | | | | | Previously, Scene.Inventory.DeRezObjects() forced the persistence of prims before deletion. This is necessary so that freshly delinked prims can be deleted (otherwise they remain as parts of their old group and reappear on server restart). However, DeRezObjects() deleted to user inventory, which is not required by llDie() or direct region module unlink and deletion. Therefore, forced persistence has been pushed down into Scene.UnlinkSceneObject() to be more general, this is still on the DeRezObjects() path. Uncommented TestDelinkPersistence() since this now passes. Tests required considerable elaboration of MockRegionDataPlugin to reflect underlying storing of parts.
| * Make console backup command do a forced backup rather than non-forcedJustin Clark-Casey (justincc)2010-09-061-5/+0
| | | | | | | | Remove no-arg backup method for simplicity as it only make sense to call non-forced backup internally
| * Add test to check persistence of newly added pre-linked objectsJustin Clark-Casey (justincc)2010-09-061-2/+11
| | | | | | | | | | Added a MockRegionDataPlugin to do in-memory persistence for tests since adding this to OpenSim.Data.Null.NullDataStore doesn't seem appropriate NullDataStore can do nothing because OpenSim only ever retrieve region objects from the database on startup. Adding an in-memory store here would be unecessary overhead.
* | 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
| | | | | | | | script state enum to reflect recent changes.
* | Prevent Meta7 plants from being treated like dropped attachments and removedMelanie Thielker2010-09-011-1/+1
| | | | | | | | from the sim.
* | Improve sim health reporting. Output error message if heartbeat thread is ↵Melanie Thielker2010-09-011-1/+2
| | | | | | | | restarted by scene. This may help to find out why this recovery mechanism isn't working.
* | Merge branch 'careminster-presence-refactor' of ↵Melanie Thielker2010-08-311-2/+3
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ Merge branch 'careminster-presence-refactor' of ↵meta72010-08-301-21/+77
| |\ \ | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | Kick the user from the region in the circumstance that the TP home failed - ↵meta72010-08-301-2/+3
| | | | | | | | | | | | | | | | ONLY if it was triggered by an estate ban. This makes baby jesus cry, and should be fixed to search for alternative regions if the home region is unavailable.
* | | | Adjust the "Magic numbers" we use because we can't reference the actualMelanie Thielker2010-08-311-1/+1
| |/ / |/| | | | | | | | script state enum to reflect recent changes.
generated by cgit v1.1 at 2024-12-20 18:10:02 +0000