aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | adding utility method for getting SceneObjectGroup from sceneSignpostMarv2012-09-061-0/+12
| | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | adding utility method for getting SceneObjectPart from sceneSignpostMarv2012-09-061-0/+12
| | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | | Merge branch 'avination' into careminsterMelanie2012-08-311-0/+6
|\ \ \ | | |/ | |/|
| * | [possible still very broken] mess around keyframes. timer eventsUbitUmarov2012-08-281-0/+6
| | | | | | | | | | | | threads overlaps, some null objects exceptions, region crossing...
* | | renaming to be similar to equivalent Set commandMelanie2012-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
* | | Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminsterMelanie2012-08-251-1/+1
|\ \ \ | | |/ | |/|
| * | If a connecting scene presence is replacing an existing scene presence then ↵Justin Clark-Casey (justincc)2012-08-241-1/+1
| | | | | | | | | | | | bypass close checks.
* | | Merge branch 'master' into careminsterMelanie2012-08-231-3/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Add --force flag to "kick user" console command to allow bypassing of recent ↵Justin Clark-Casey (justincc)2012-08-201-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | race condition checks. This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once). You should only attempt --force if a normal kick fails. This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive. This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
* | | Merge branch 'avination' into careminsterMelanie2012-08-231-1/+1
|\ \ \ | | |/ | |/|
| * | Make terrain save every 1000 frames instead of every 50. Database load is a ↵Melanie2012-08-221-1/+1
| | | | | | | | | | | | sim killer.
* | | Merge branch 'master' into careminsterMelanie2012-08-181-0/+30
|\ \ \ | |/ / |/| / | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * enables configurable minimum sizes for physical & non-physical primsSignpostMarv2012-08-151-1/+30
| |
| * Add support for the extra params to scene and the event managerMelanie2012-08-151-0/+39
| |
| * Add a skeleton for a name value storage associated with regionsMelanie2012-08-151-0/+4
| |
* | Add support for the extra params to scene and the event managerMelanie2012-08-151-0/+39
| |
* | Add a skeleton for a name value storage associated with regionsMelanie2012-08-151-0/+4
| |
* | Merge branch 'careminster' into avinationMelanie2012-08-141-2/+9
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
| * \ Merge branch 'master' into careminsterMelanie2012-08-141-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * Lay some groundwork for temp attachments. Decouple attachments from inventory.Melanie2012-08-141-1/+1
| | |
| * | Merge branch 'master' into careminsterMelanie2012-08-041-1/+8
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | * Move previously unadvertised SendPeriodicAppearanceUpdates setting from ↵Justin Clark-Casey (justincc)2012-08-031-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Startup] to [Appearance] config section. Add description and default of false (as before) to OpenSimDefaults.ini If set to true, this config switch will resend avatar appearance information (a small amount of UUID data, not the baked textures themselves) to other avatars in the sim every 60 seconds. For me, this has helped with situations where avatars appear persistently grey - the LL viewer sometimes did not appear to request assets the first time the appearance data was sent. However, this switch will not help with other appearance failure situations (e.g. failure to bake assets). This setting is experimental but will not have any significant impact on the simulator if turned to true.
* | | Make WaitGetScenePresence wait for up to 20 secondsMelanie2012-08-031-1/+1
| | |
* | | minor change avoiding a null referenceUbitUmarov2012-08-031-2/+4
| | |
* | | Make sure the position of a loggin-in agent is within region boundaries sinceMelanie2012-08-031-0/+9
|/ / | | | | | | out of bounds positions cause a rejection of the login.
* | Merge branch 'master' into careminsterMelanie2012-08-011-0/+16
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
| * Create the ability for physics modules to request assets on demand byMelanie2012-08-011-0/+16
| | | | | | | | | | | | themselves. For that, the physics module simply calls RequestAssetMethod, which in turn points to Scene.PhysicsRequestAsset. This gives physics access to the asset system without introducing unwanted knowledge of the scene class.
* | Merge branch 'master' into careminsterMelanie2012-07-281-5/+17
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| * Avoid a race condition between the scene shutdown thread and the update ↵Justin Clark-Casey (justincc)2012-07-271-3/+5
| | | | | | | | | | | | | | | | | | thread since commit c150320 (Thu Jul 26 15:27:18 2012) c150320 started explicitly disposing of the physics scene and nulling it out on region shutdown. However, the update loop may not have yet checked Scene.ShuttingDown, particularly if avatars were not in the scene, causing failure when it tried to lookup time dilation. This commit moves the setting of m_shuttingDown above the existing 500ms pause to notify avatars that they are being kicked. This should not affect the few other places that use this flag.
| * Add a Dispose() of the physics engine when a scene is being shutdown.Robert Adams2012-07-261-0/+9
| |
| * Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring ↵Justin Clark-Casey (justincc)2012-07-251-0/+1
| | | | | | | | with other monitoring code from OpenSim.Framework
| * Make SceneManager.OnRegionsReadyStatusChange event available.Justin Clark-Casey (justincc)2012-07-251-2/+2
| | | | | | | | | | This is fired when all regions are ready or when at least one region becomes not ready. Recently added EventManager.OnRegionReady becomes OnRegionReadyStatusChange to match OnLoginsEnabledStatusChange
| * Change attachment handling to remove object from the scene first as perMelanie2012-07-231-11/+1
| | | | | | | | | | | | justincc's original work. Sample scripts before doing so. Also refactor some crucial common code and eliminate parameters that were only ever used with the same constant value.
* | Merge branch 'avination' into careminsterMelanie2012-07-231-11/+1
|\ \
| * | Change attachment handling to remove object from the scene first as perMelanie2012-07-231-11/+1
| | | | | | | | | | | | | | | | | | justincc's original work. Sample scripts before doing so. Also refactor some crucial common code and eliminate parameters that were only ever used with the same constant value.
* | | Merge branch 'master' into careminsterMelanie2012-07-201-2/+19
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
generated by cgit v1.1 at 2024-12-19 12:26:00 +0000