aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* initial suport for ExtraPhysical parts parameters. Reading from llclientView ↵UbitUmarov2012-03-131-1/+1
| | | | to SOP including SOPserialization (not to databases). No action on physics still. No send to viewer, etc
* BIG MESS. changed Iclient interface so only one event is used to inform ↵UbitUmarov2012-03-101-0/+4
| | | | scene about position scale or rotation change by client (others can be added). Its served at SceneGraph that does permition checks, undostore and sends down to SOG. changed values are stored in a class (ObjectChangeData) and what is changed as a enum (ObjectChangeWhat) with bit fields and 'macros' of this for better readability (at top of scenegraph.cs lasy to find better place for now) this can be extended for other things clients changes and need undo/redo. SOG process acording to what is changed. Changed UNDO/redo to use this also (warning is only storing what is changed, previus stored all, this must be checked for side efects. to save all PRS change commented line in scenegraph). Still have excessive calls to ScheduleGroupForTerseUpdate. **** UNTESTED ****
* Merge branch 'master' into careminsterMelanie2012-03-081-1/+1
|\
| * Display help commander topics in capitalized form - the commands themselves ↵Justin Clark-Casey (justincc)2012-03-081-1/+1
| | | | | | | | | | | | are still lowercase. Also convert the estate commands to simply AddCommand() calls so that commands from two different modules can be placed in the same category
| * Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
* | Fix merge issueMelanie2012-03-071-76/+79
| |
* | Merge branch 'master' into careminsterMelanie2012-03-071-24/+23
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Stop individually deleting objects at the end of each ObjectTortureTest.Justin Clark-Casey (justincc)2012-03-071-28/+21
| | | | | | | | | | | | We can now do this since the entire scene and all objects within it are now successfully gc'd at the end of these tests. This greatly improves the time taken to run each test (by reducing teardown time, not the time to actually do the test work that we're interested in). Slightly simplifies config read in Scene constructor to help facilitate this.
| * Explictly close down the StatsReporter so that we can shutdown its timerJustin Clark-Casey (justincc)2012-03-061-0/+2
| | | | | | | | This is another step necessary for the scene to be garbage collected between performance tests
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-061-3/+10
|\ \ | | | | | | | | | careminster
| * | 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
|\ \ \ | |/ / | | | | | | careminster
| * | Move KeyframeMotion from SOG to SOP because we can't persist it anyMelanie2012-02-261-2/+2
| | | | | | | | | | | | other way because SOG doesn't technically exist in the DB
| * | Serialize Keyframe motion for region crossingsMelanie2012-02-261-0/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-03-031-7/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Remove outdated comment about checking attachment prims in ↵Justin Clark-Casey (justincc)2012-03-021-3/+1
| | | | | | | | | | | | Scene.PipeEventsForScript()
| * | Allow a script to receive events if its root prim is in an area where it's ↵Justin Clark-Casey (justincc)2012-03-021-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | allowed to run rather than checking its own prim. This allows scripts to run in child prims that are outside region boundaries. This is an interim patch applied from http://opensimulator.org/mantis/view.php?id=5899 though it does not resolve that bug Thanks tglion!
* | | 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
| | | | | | | | | | | | | | | | On the first frame, all startup scene objects are added to the physics scene. This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame. This commit also slightly changes the behaviour of timeout reporting. Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check. Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
| * Try to resolve some problems with viewers crashing after hitting parcel ↵Justin Clark-Casey (justincc)2012-02-231-5/+12
| | | | | | | | | | | | | | | | | | | | banlines or freezing on the banline. This involves 1) On forcible teleport, call m_scene.RequestTeleportLocation() rather than ScenePresence.Teleport() - only EntityTransferModule now should call SP.Teleport() 2) When avatar is being forcibly moved due to banlines, use a 'stop movement' tolerance of 0.2 to requested position rather than 1 This prevents the avatar sometimes being stuck to banlines until they teleport somewhere else. This aims to fix some problems in http://opensimulator.org/mantis/view.php?id=5822
* | Partially apply the core banlines fixMelanie2012-02-231-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-02-231-9/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * 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 ↵Justin Clark-Casey (justincc)2012-02-221-8/+2
| | | | | | | | | | | | constructor and never subsequent set to null.
| * | Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-231-1/+4
| |/ | | | | | | | | | | potential bad update that places an object at the opposite side of the origin sim for a moment before actually crossing it. Especially important in grids like OSG where lag between sims is high.
* | Merge branch 'master' into careminsterMelanie2012-02-211-15/+14
|\ \ | |/ | | | | Conflicts:
| * Fix bug where NPCs would establish child agents on other neighbour regions ↵Justin Clark-Casey (justincc)2012-02-211-15/+14
| | | | | | | | that had come up after the NPC was created.
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-191-6/+6
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-02-191-6/+6
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| | * Use localy defined name, TPFlags, for Constants.TeleportFlagsBlueWall2012-02-191-6/+6
| | |
* | | Merge branch 'ubitwork'Melanie2012-02-191-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | Conflicts: OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
| * | 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
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
| * | 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
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * change NonPhysicalPrimMax to NonphysicalPrimMax in Scenes.cs to make thenebadon2012-02-041-1/+1
| | | | | | | | variable in OpenSim.ini and Regions.ini match
* | 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
| | | | | | | | with region heartbeats
| * 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
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Small optimization to last commitMelanie2012-02-011-5/+5
| | |