aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2013-02-071-0/+7
|\
| * Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SPMelanie2013-02-061-0/+7
| |
* | Merge branch 'master' into careminsterMelanie2013-02-061-5/+0
|\ \
| * | Remove long unused Scene.DumpAssetsToFile boolean.Justin Clark-Casey (justincc)2013-02-061-5/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-061-11/+0
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | Remove unused ScriptEngineLoader and ScriptEngineInterface in ↵Justin Clark-Casey (justincc)2013-02-061-11/+0
| | | | | | | | | | | | | | | | | | OpenSim.Region.Framework.dll I believe this predates the generic system of registering interfaces and is very long unused.
* | | Merge branch 'master' into careminsterMelanie2013-01-311-1/+1
|\ \ \ | |/ /
| * | Whitespace fix and removing unneccessary parenthesesMelanie2013-01-311-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-01-311-108/+106
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Allow use of MaptileStaticUUID in Regions.ini to override the global setting ↵Jak Daniels2013-01-301-1/+6
| | | | | | | | | | | | | | | | | | in OpenSim.ini for each region. Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | Add the Avination physics raycast glue so Core Physics can implement raycastMelanie2013-01-231-0/+13
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-01-271-1/+1
|\ \ \ | | |/ | |/|
| * | Reinstate cleaning objects from parcel when avatars sit on them. Instead do itMelanie2013-01-261-1/+1
| | | | | | | | | | | | properly for temp-on-rez. Auto-return overrides sitting. Temp does not.
* | | Merge branch 'avination' into careminsterMelanie2013-01-241-2/+2
|\ \ \ | |/ /
| * | Fix a type (Suports => Supports). Also put the normal terrain collision checkMelanie2013-01-231-2/+2
| | | | | | | | | | | | into the physics check patch for now since physics doesn't properly return land for some reason (as tested by Nebadon)
* | | Merge branch 'avination' into careminsterMelanie2013-01-231-6/+12
|\ \ \ | |/ /
| * | Prevent scene from holding references to SOGs with attargets beyond SOG deletionMelanie2013-01-211-6/+12
| | |
* | | Merge branch 'master' into careminsterMelanie2013-01-191-0/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
| * | Add "debug set set animations true|false" region console command.Justin Clark-Casey (justincc)2013-01-181-0/+5
| | | | | | | | | | | | | | | Setting this logs extra information about animation add/remove, such as uuid and animation name Unfortunately cannot be done per client yet
* | | Merge branch 'master' into careminsterMelanie2013-01-111-103/+80
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Move scene debug commands into separate module. Command changes from "debug ↵Justin Clark-Casey (justincc)2013-01-101-94/+59
| | | | | | | | | | | | scene <key> <value>" to "debug scene set <key> <value>" to accomodate future settings
| * | refactor: route the final scene backup through the same code that handles ↵Justin Clark-Casey (justincc)2013-01-101-10/+1
| | | | | | | | | | | | | | | | | | periodic backup This is rather than making unnecessary duplicate checks that the SOG later performs again.
| * | Add "debug scene pbackup true|false" console command. This enables or ↵Justin Clark-Casey (justincc)2013-01-101-9/+30
| | | | | | | | | | | | | | | | | | disable periodic scene backup. For debug purposes. If false, scene is still saved on shutdown.
* | | Merge branch 'avination' into careminsterMelanie2013-01-101-0/+1
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Prevent avatar data from being sent during login when it's not valid andMelanie2013-01-081-0/+1
| | | | | | | | | | | | crashes login on some viewers.
* | | Merge branch 'master' into careminsterMelanie2013-01-041-27/+1
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Fixed several problems with the Sun: some settings didn't work, or were ↵Oren Hurvitz2013-01-021-27/+1
| | | | | | | | | | | | inconsistently used. - The sun position is always calculated by combining the sun settings in the Region and Estate. This fixes the problem that 'UseEstateSun' didn't work. - To remove ambiguity, the EstateToolsSunUpdate event no longer accepts the sun's position as parameters. That's because the position is always calculated from the Region and Estate settings. - Use only the 'FixedSun' flag to determine whether the sun is fixed; not the 'UseGlobalTime' flag. - Don't change the region's 'SunPosition' field according to the sun's position: this field is used only to set the position when using a FixedSun. (The 'SunVector' field does get updated according to the sun's position in the sky)
* | | Merge branch 'master' into careminsterMelanie2012-12-071-4/+11
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | minor: Put Scene.PhysicsRequestAsset() into standard C# xml format.Justin Clark-Casey (justincc)2012-12-041-4/+11
| | |
* | | Merge branch 'master' into careminsterMelanie2012-11-251-1/+6
|\ \ \ | |/ / | | / | |/ |/| | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * minor: Make note in log if scene was restarted due to an unrecoverable ↵Justin Clark-Casey (justincc)2012-11-231-1/+6
| | | | | | | | physics error
* | Merge branch 'master' into careminsterMelanie2012-11-231-8/+2
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Fix problem where restarting the currently selected region would stop ↵Justin Clark-Casey (justincc)2012-11-231-8/+2
| | | | | | | | | | | | various console commands (e.g. "show users") from working. This was because the "currently selected" scene reference was being left as the dead scene instead of the restarted Scene object.
* | Merge branch 'master' into careminsterMelanie2012-11-121-3/+1
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/ModuleLoader.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Remove the old style module loader and all references to itMelanie2012-11-121-3/+1
| |
* | Merge branch 'avination' into careminsterMelanie2012-11-041-1/+8
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * \ Merge branch 'ubitwork' into avinationMelanie2012-11-011-1/+9
| |\ \
| | * | remove pre physics build testingUbitUmarov2012-10-281-1/+1
| | | |
| | * | Add some extra debug on scene closeUbitUmarov2012-10-281-1/+9
| | | |
| * | | Deep copy the collection of at_target objects so it can't be modified whileMelanie2012-10-281-1/+4
| |/ / | | | | | | | | | it's being iterated
* | | Merge branch 'master' into careminsterMelanie2012-10-311-5/+9
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Framework/ChildAgentDataUpdate.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Only create a new list to check if objects have reached targets if there ↵Justin Clark-Casey (justincc)2012-10-301-5/+9
| | | | | | | | | | | | actually are any targets.
* | | Merge branch 'master' into careminsterMelanie2012-10-301-2/+3
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Fix memory leak where removing an NPC did not remove its circuits.Justin Clark-Casey (justincc)2012-10-291-2/+3
| | | | | | | | | | | | | | | | | | This was because we were removing by circuitcode where NPCs have no code. Now removing by agent ID instead. This commit also fixes the "show circuits" console command to work properly where the circuit has no associated IP address.
* | | Merge branch 'master' into careminsterMelanie2012-10-281-1/+4
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Deep copy the collection of at_target objects so it can't be modified whileMelanie2012-10-281-2/+5
| | | | | | | | | | | | it's being iterated
* | | Merge branch 'master' into careminsterMelanie2012-10-261-18/+39
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
| * | Comment out InventoryTransferModule.NeedSceneCacheClear() and invocations ↵Justin Clark-Casey (justincc)2012-10-261-11/+13
| | | | | | | | | | | | | | | | | | since the call itself does nothing and the return value is ignored by all callers. This is a very old method (+4 years) so is probably confusing code cruft.
| * | minor: if a scene is already shutting down on Scene.Close(), warn and exit ↵Justin Clark-Casey (justincc)2012-10-251-0/+6
| | | | | | | | | | | | | | | | | | instead of attempting to run another shutdown concurrently. Thanks to Oren Hurvitz for this change.
| * | In Scene.Close(), dispose of the physics scene after base.Close() since ↵Justin Clark-Casey (justincc)2012-10-251-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | script events can still access Physics scene until the script engine shuts down (triggered off base.Close()) XEngine listeners to EventManager.OnShutdown which is triggered from base.Close(). Possibly it could listen for the earlier OnSceneShuttingDown instead, but the easier solution right now is to relocate disposal of the physics scene. This bug has existed since c150320 (Thu Jul 26 15:27:18 2012) and was in 0.7.4
generated by cgit v1.1 at 2024-10-24 01:32:02 +0000