aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-081-1/+1
|\
| * Display help commander topics in capitalized form - the commands themselves a...Justin Clark-Casey (justincc)2012-03-081-1/+1
| * Change "help" to display categories/module list then "help <category/module>"...Justin Clark-Casey (justincc)2012-03-081-1/+1
* | Fix merge issueMelanie2012-03-071-76/+79
* | Merge branch 'master' into careminsterMelanie2012-03-071-24/+23
|\ \ | |/
| * Stop individually deleting objects at the end of each ObjectTortureTest.Justin Clark-Casey (justincc)2012-03-071-28/+21
| * Explictly close down the StatsReporter so that we can shutdown its timerJustin Clark-Casey (justincc)2012-03-061-0/+2
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-061-3/+10
|\ \
| * | A stab at making llEjectFromLand work in all casesMelanie2012-03-051-3/+10
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-041-0/+2
|\ \ \ | |/ /
| * | Move KeyframeMotion from SOG to SOP because we can't persist it anyMelanie2012-02-261-2/+2
| * | Serialize Keyframe motion for region crossingsMelanie2012-02-261-0/+2
* | | Merge branch 'master' into careminsterMelanie2012-03-031-7/+2
|\ \ \ | | |/ | |/|
| * | Remove outdated comment about checking attachment prims in Scene.PipeEventsFo...Justin Clark-Casey (justincc)2012-03-021-3/+1
| * | Allow a script to receive events if its root prim is in an area where it's al...Justin Clark-Casey (justincc)2012-03-021-4/+1
* | | Merge branch 'master' into careminsterMelanie2012-02-241-20/+10
|\ \ \ | |/ / | | / | |/ |/|
| * Get rid of some of the identical exception catching in Scene.Update().Justin Clark-Casey (justincc)2012-02-241-17/+1
| * Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-241-3/+9
| * Try to resolve some problems with viewers crashing after hitting parcel banli...Justin Clark-Casey (justincc)2012-02-231-5/+12
* | Partially apply the core banlines fixMelanie2012-02-231-1/+1
* | Merge branch 'master' into careminsterMelanie2012-02-231-9/+6
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-02-231-8/+2
| |\
| | * Remove two spurious m_sceneGraph != null checks in Scene.cs. It's set in con...Justin Clark-Casey (justincc)2012-02-221-8/+2
| * | Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-231-1/+4
| |/
* | Merge branch 'master' into careminsterMelanie2012-02-211-15/+14
|\ \ | |/
| * Fix bug where NPCs would establish child agents on other neighbour regions th...Justin Clark-Casey (justincc)2012-02-211-15/+14
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-191-6/+6
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-02-191-6/+6
| |\ \ | | |/
| | * Use localy defined name, TPFlags, for Constants.TeleportFlagsBlueWall2012-02-191-6/+6
* | | Merge branch 'ubitwork'Melanie2012-02-191-1/+1
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-151-3/+3
| |\ \
| * | | initial introdution of physics actor building control.UbitUmarov2012-02-081-1/+1
* | | | Merge branch 'master' into careminsterMelanie2012-02-181-0/+26
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Route logins according to Estate, Telehub and TeleportFlagsBlueWall2012-02-181-2/+4
| * | Propagate our teleport flags on loginsBlueWall2012-02-181-1/+4
| * | Fix missing telehub handling on loginBlueWall2012-02-171-0/+21
* | | Merge branch 'master' into careminsterMelanie2012-02-151-3/+3
|\ \ \ | |/ / | | / | |/ |/|
| * Add some more data to the new user connection logging for debug purposes.Justin Clark-Casey (justincc)2012-02-141-3/+3
* | Merge branch 'master' into careminsterMelanie2012-02-051-2/+1
|\ \ | |/
| * change NonPhysicalPrimMax to NonphysicalPrimMax in Scenes.cs to make thenebadon2012-02-041-1/+1
* | Merge branch 'master' into careminsterMelanie2012-02-031-4/+34
|\ \ | |/
| * ObjectAddedToScene event should be fired when duplicating objectsDan Lake2012-02-021-4/+22
| * Add event RegionHeartbeatEnd for modules interested in coordinating activity ...Dan Lake2012-02-011-10/+12
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-011-112/+51
| |\
| * | Add a version of GetGroupByPrim to Scene which accepts UUID instead of localIDDan Lake2012-01-191-0/+10
* | | Streamline banning code using existing methods.Melanie2012-02-021-3/+13
* | | Merge branch 'master' into careminsterMelanie2012-02-011-6/+16
|\ \ \ | | |/ | |/|
| * | Small optimization to last commitMelanie2012-02-011-5/+5
| * | Fix copy/paste errorsMelanie2012-02-011-2/+2
| * | Straighten out some attachment mess. Don't save attachment states for HGMelanie2012-02-011-1/+11