aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ubitwork' into avinationMelanie2012-08-031-0/+7
|\
| * on presence close(), release animator and OnRegionHeartbeatEnd eventUbitUmarov2012-08-031-0/+7
* | Merge branch 'careminster' into avinationMelanie2012-08-033-2/+13
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-08-033-2/+13
| |\ \
| | * | refactor: rename SOG.RezzingObjectID to SOG.FromPartID to match FromFolderID,...Justin Clark-Casey (justincc)2012-08-032-2/+2
| | * | Don't bothre setting RezzingObjectID to UUID.Zero in SOG constructor - this i...Justin Clark-Casey (justincc)2012-08-031-3/+4
| | * | ImprovedTerseObjectUpdate packet does not support shape updates, thus schedul...SignpostMarv2012-08-031-1/+1
| | * | Initialize the Rezzing object to UUID.ZeroMelanie2012-08-021-3/+4
| | * | reduced-complexity implementation of function to get rezzing object keySignpostMarv2012-08-022-1/+10
* | | | Make WaitGetScenePresence wait for up to 20 secondsMelanie2012-08-031-1/+1
| |_|/ |/| |
* | | minor change avoiding a null referenceUbitUmarov2012-08-031-2/+4
* | | Make sure the position of a loggin-in agent is within region boundaries sinceMelanie2012-08-031-0/+9
|/ /
* | Merge branch 'master' into careminsterMelanie2012-08-011-0/+16
|\ \ | |/
| * Create the ability for physics modules to request assets on demand byMelanie2012-08-011-0/+16
* | Merge branch 'avination' into careminsterMelanie2012-08-012-4/+12
|\ \
| * \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-07-311-1/+3
| |\ \
| | * | Correct StandUp position and rotationMelanie2012-07-301-1/+3
| * | | Reverse a senseless change in the prioritizer. Why I would want avatars to re...Melanie2012-07-311-3/+9
| |/ /
* | | Merge branch 'avination' into careminsterMelanie2012-07-291-0/+3
|\ \ \ | |/ /
| * | Fix an exception while outputting a log messageMelanie2012-07-291-1/+1
| * | See that if controls are taken, those are released before taking new onesMelanie2012-07-291-0/+3
* | | Fix some merge issues and a functional issue in the scene managerMelanie2012-07-281-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-07-287-40/+144
|\ \ \ | | |/ | |/|
| * | Avoid a race condition between the scene shutdown thread and the update threa...Justin Clark-Casey (justincc)2012-07-271-3/+5
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2012-07-261-23/+46
| |\ \
| | * | When copying items, copy the item description field instead of the asset desc...Justin Clark-Casey (justincc)2012-07-261-23/+46
| * | | Add a Dispose() of the physics engine when a scene is being shutdown.Robert Adams2012-07-261-0/+9
| |/ /
| * | Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring wi...Justin Clark-Casey (justincc)2012-07-251-0/+1
| * | Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-252-2/+2
| * | Make SceneManager.OnRegionsReadyStatusChange event available.Justin Clark-Casey (justincc)2012-07-254-10/+76
| * | Change attachment handling to remove object from the scene first as perMelanie2012-07-232-11/+19
| * | Committing Avination's memleak fix-a-thon, installment #3Melanie2012-07-231-0/+2
* | | Merge branch 'avination' into careminsterMelanie2012-07-232-11/+19
|\ \ \ | | |/ | |/|
| * | Change attachment handling to remove object from the scene first as perMelanie2012-07-232-11/+19
* | | Merge branch 'master' into careminsterMelanie2012-07-205-158/+202
|\ \ \ | | |/ | |/|
| * | Stop explicitly closing and nulling out Animator in order to prevent NREs in ...Justin Clark-Casey (justincc)2012-07-192-23/+7
| * | Prevent race conditions between two threads that call LLClientView.Close() si...Justin Clark-Casey (justincc)2012-07-191-3/+3
| * | Add TestCreateDuplicateRootScenePresence() regression test.Justin Clark-Casey (justincc)2012-07-193-1/+41
| * | Add basic TestCreateRootScenePresence() regression testJustin Clark-Casey (justincc)2012-07-191-135/+144
* | | Merge branch 'master' into careminsterMelanie2012-07-196-44/+105
|\ \ \ | |/ / | | / | |/ |/|
| * Add EventManager.OnRegionLoginsStatusChange fired whenever logins are enabled...Justin Clark-Casey (justincc)2012-07-194-16/+35
| * Add back notification to neighbouring regions when RegionReadyModule is not a...Justin Clark-Casey (justincc)2012-07-181-0/+3
| * Perform other region ready actions even if simulator is configured to leave l...Justin Clark-Casey (justincc)2012-07-182-20/+19
| * Fix bug where region ready was being triggered twice in quick succession if a...Justin Clark-Casey (justincc)2012-07-181-9/+12
| * Establish EventManager.OnRegionReady event. This will only be triggerred onc...Justin Clark-Casey (justincc)2012-07-182-3/+35
| * Pass entire scene object in OnLoginsEnabled event rather than just the region...Justin Clark-Casey (justincc)2012-07-182-5/+4
| * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2012-07-182-24/+16
| |\
| | * Close() the ScenePresence after we've removed it from the scene graph, to cut...Justin Clark-Casey (justincc)2012-07-181-10/+16
| * | Missing parameter in log error message was throwing exceptionDan Lake2012-07-181-1/+1
* | | Merge branch 'ubitwork' into avinationMelanie2012-07-174-51/+70
|\ \ \