aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | Allow "show object", "show part", "dump object" and "delete object" to ↵Justin Clark-Casey (justincc)2012-10-241-1/+12
| | | | | | | | | | | | | | | | | | accept a local ID as well as a UUID. This means that the sub-commands are now id rather than uuid, e.g. show object id
* | | Merge branch 'master' into careminsterMelanie2012-10-161-2/+3
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
| * | minor: Add/correct some doc messages associated with entity teleport.Justin Clark-Casey (justincc)2012-10-161-2/+3
| | | | | | | | | | | | | | | | | | I believe UseCircuitCode is sent on EnableSimulator EQ message, rather than EstablishAgentCommunication At least with LL 3.3.4, EstablishAgentCommunication appears unnecessary in the teleport context - viewer still requests it though possibly only after TeleportFinish(). However, we will continue to send it.
* | | Merge branch 'master' into careminsterMelanie2012-10-121-210/+297
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Fix problems with regression tests by allowing invoke of Update() with a ↵Justin Clark-Casey (justincc)2012-10-121-3/+4
| | | | | | | | | | | | finite number of frames even if the scene isn't active.
| * | Add "active true|false" to "debug scene" console command.Justin Clark-Casey (justincc)2012-10-121-3/+37
| | | | | | | | | | | | This allows the scene update and maintenance loops to be started and stopped for debug purposes.
| * | Lock on AgentCircuitData during Scene.AddClient() and RemoveClient() to ↵Justin Clark-Casey (justincc)2012-10-101-201/+256
| | | | | | | | | | | | | | | | | | prevent an inactive connection being left behind if the user closes the viewer whilst the connection is being established. This should remove the need to run the console command "kick user --force" when these connections are left around.
| * | minor: elaborate method doc on Scene.NewUserConnection()Justin Clark-Casey (justincc)2012-10-091-6/+13
| | |
| * | Trigger ObjectAddedToScene when loading objects from oarfile. Already ↵Dan Lake2012-10-051-1/+8
| | | | | | | | | | | | triggers when creating, duplicating or loading from database, incoming attachments, etc
| * | Forgot to actually remove the packetpool set code from scene.Justin Clark-Casey (justincc)2012-10-051-7/+0
| | |
* | | Fix merge issuesMelanie2012-10-071-7/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2012-10-031-0/+6
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * | Prevent the ExtraSettings code from crashing SQLite driven sims.Melanie2012-10-021-0/+6
| | |
| * | Add MaxPrimsUndo config setting to [Startup] section of OpenSim.ini.Justin Clark-Casey (justincc)2012-09-271-3/+2
| | | | | | | | | | | | | | | | | | This controls how many undo steps the simulator will store for each prim. Default is now 20 rather than 5 as it briefly was. The default number could be increased through this is a memory tradeoff which will scale with the number of prims in the sim and level of activity.
| * | Enforce existing 5 action hardcoded undo limit.Justin Clark-Casey (justincc)2012-09-261-1/+5
| | | | | | | | | | | | | | | | | | | | | This was present in the code but not enforced, which led to a memory leak over time as part properties were changed, whether by viewer, script or another source. This commit enforces that limit, which will soon become configurable. Regression test for undo limit added Should help with http://opensimulator.org/mantis/view.php?id=6279
* | | Merge branch 'avination' into careminsterMelanie2012-09-271-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Make IncomingCloseChildAgent not send a stop packet. This may preventMelanie2012-09-161-1/+1
| | | | | | | | | | | | a viewer from being logged out after an otherwise successful teleport.
* | | Merge branch 'master' into careminsterMelanie2012-09-241-3/+5
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Make ResendAppearanceUpdates = true by default in [Appearance] in ↵Justin Clark-Casey (justincc)2012-09-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | OpenSimDefaults.ini. This resends appearance uuids to avatars in the scene once a minute. I have seen this help in the past resolve grey appearance problems where viewers have for unknown reasons sometimes ignored the packet. The overhead is very small since only the UUIDs are sent - the viewer then requests the texture only if it does not have it cached. This setting will not help with cloudy avatars which are usually due to the viewer not uploading baked texture data or uploading something that isn't valid JPEG2000
| * | Cleanup from prev. commitBlueWall2012-09-181-2/+2
| | | | | | | | | | | | Make correct defaults to Phys/nonPhys prims to fix errors in prev. commit
| * | Fix some inconsistencies in configurartion: NonPhys primsBlueWall2012-09-181-3/+3
| | | | | | | | | | | | | | | | | | Fix inconsistencies between configuration parameter names and their description names. Changing the configuration parameters for non physical prim size min-max from Nonphys* to NonPhys*. Please update your OpenSim.ini and Regions.ini to reflect these changes.
* | | Merge branch 'master' into careminsterMelanie2012-09-171-0/+3
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| * | preventing a null reference exception from being thrownSignpostMarv2012-09-171-0/+3
| | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | | Merge branch 'avination' into careminsterMelanie2012-09-161-1/+1
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
| * | Wait a bit longer for new scene presences to aid tps into laggy regionsMelanie2012-09-141-1/+1
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-09-101-0/+2
|\ \ \ | |/ /
| * | One more redundante ParcelProprieties on loginUbitUmarov2012-09-071-0/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-091-0/+21
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | implementing per-region configuration of limits on the number of prims one ↵SignpostMarv2012-09-091-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | can have in a linkset Applied with changes - patch was based on a repo different from core Signed-off-by: Melanie <melanie@t-data.com>
| * | refactoring to allow Scene.GetLandData to accept Vector3 as an argument. ↵SignpostMarv2012-09-081-0/+10
| | | | | | | | | | | | Note that the prior work on LSL_Vector implicit operators means one does not need to explicitly cast a LSL_Vector to Vector3
* | | Merge branch 'master' into careminsterMelanie2012-09-071-0/+24
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs
generated by cgit v1.1 at 2025-01-02 12:13:53 +0000