aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-191-17/+42
|\
| * Further refinement on propertiesBlueWall2012-05-181-7/+4
| * Cleanup + change properties to set fields with private set : Thanks Justin fo...BlueWall2012-05-181-2/+4
| * Provide Telehub setting to allow use of landmarksBlueWall2012-05-181-0/+7
| * Check agent limit against root agent count rather than both root and child ag...Justin Clark-Casey (justincc)2012-05-171-15/+32
* | Merge branch 'master' into careminsterMelanie2012-05-141-19/+63
|\ \ | |/
| * minor: comment out individual attachment transfer log messages for nowJustin Clark-Casey (justincc)2012-05-141-4/+4
| * Add configurable SpawnPointRoutingBlueWall2012-05-131-19/+62
* | Merge branch 'master' into careminsterMelanie2012-05-131-7/+8
|\ \ | |/
| * Add even for terrain tainting and synchronize terrain module with physics sce...Dan Lake2012-05-101-7/+8
* | Merge branch 'master' into careminsterMelanie2012-04-271-38/+44
|\ \ | |/
| * Add regression test for teleporting an agent between separated regions on the...Justin Clark-Casey (justincc)2012-04-271-2/+6
| * Comment out old Scene.HandleLogOffUserFromGrid() to reduce client closing ana...Justin Clark-Casey (justincc)2012-04-261-35/+35
| * minor: Add avatar name to removing agent log messageJustin Clark-Casey (justincc)2012-04-261-2/+2
| * Add a configuration switch to turn on/off the use of the trashMic Bowman2012-04-251-0/+2
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-04-251-4/+14
|\ \
| * | "save the catgirls"UbitUmarov2012-04-241-4/+9
| * | display heatbeat sleep time in stats. This may not be good for general use, ...UbitUmarov2012-04-241-0/+5
* | | Merge branch 'master' into careminsterMelanie2012-04-231-7/+3
|\ \ \ | |/ / |/| / | |/
| * Fix bug where setting phantom on a prim would result in a server log message ...Justin Clark-Casey (justincc)2012-04-221-9/+5
* | added suport funtions for ubitODE raycastFilteredUbitUmarov2012-04-161-0/+13
* | Merge branch 'master' into careminsterMelanie2012-04-071-7/+1
|\ \ | |/
| * Store FromItemID for attachments once on SOG instead of on every SOP and only...Justin Clark-Casey (justincc)2012-04-071-1/+1
| * remove possible PhysActor unexpectedly null race conditions when changing pri...Justin Clark-Casey (justincc)2012-04-031-6/+0
* | Merge branch 'master' into careminsterMelanie2012-04-031-4/+0
|\ \ | |/
| * Eliminate race condition where many callers would check SOP.PhysicsActor != n...Justin Clark-Casey (justincc)2012-04-031-4/+0
* | Merge branch 'master' into careminsterMelanie2012-03-311-3/+9
|\ \ | |/
| * refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the...Justin Clark-Casey (justincc)2012-03-311-2/+2
| * minor: small message adjustment and unnecessary code elimination when notifyi...Justin Clark-Casey (justincc)2012-03-311-1/+1
| * fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932PixelTomsen2012-03-311-1/+7
| * Add back parts of reverted changes that were not concerned with child agent c...Justin Clark-Casey (justincc)2012-03-291-0/+4
| * Revert "Simplify friends caching by only doing this for root agents - no func...Justin Clark-Casey (justincc)2012-03-291-1/+0
| * Revert "Add comment about setting client.SceneAgent in AddNewClient()"Justin Clark-Casey (justincc)2012-03-291-3/+0
* | Merge branch 'master' into careminsterMelanie2012-03-291-0/+4
|\ \ | |/
| * Add comment about setting client.SceneAgent in AddNewClient()Justin Clark-Casey (justincc)2012-03-291-0/+3
| * Simplify friends caching by only doing this for root agents - no functions re...Justin Clark-Casey (justincc)2012-03-281-0/+1
* | Merge branch 'master' into careminsterMelanie2012-03-281-15/+0
|\ \ | |/
| * More on switching the root folder from under the viewer. More experiments.Diva Canto2012-03-271-15/+0
* | Merge branch 'master' into careminsterMelanie2012-03-281-4/+11
|\ \ | |/
| * HG: Switch root folders from under the viewer. Towards HG 2.0. This is guarde...Diva Canto2012-03-271-4/+11
* | Merge branch 'master' into careminsterMelanie2012-03-271-1/+1
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-03-271-285/+425
| |\
| * | When loading objects from DB, first add to scene, then call TriggerOnSceneObj...Dan Lake2012-03-271-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-03-271-0/+8
|\ \ \ | | |/ | |/|
| * | HG: beginning of a more restrictive inventory access procedure (optional). Ex...Diva Canto2012-03-271-0/+8
* | | Merge branch 'master' into careminsterMelanie2012-03-231-0/+16
|\ \ \ | |/ /
| * | Comment out log message about sending periodic appearance updates.Justin Clark-Casey (justincc)2012-03-231-2/+2
| * | Add experimental SendPeriodicAppearanceUpdates = true/false setting to [Start...Justin Clark-Casey (justincc)2012-03-231-0/+17
* | | Merge branch 'master' into careminsterMelanie2012-03-231-14/+77
|\ \ \ | |/ /
| * | Add a scene maintenance thread in parallel to the heartbeat thread. The main...Justin Clark-Casey (justincc)2012-03-231-14/+77