| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | |
| | |
| | |
| | | |
This reverts commit 6e7f13a72d4e43f8ca564247e0b56bf5706bbdb1.
|
|\ \ \
| |/ /
| | /
| |/
|/|
| |
| | |
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
|
| |
| |
| |
| |
| |
| |
| |
| | |
the same simulator.
This involves a large amount of change in test scene setup code to allow test scenes to share shared modules
SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static
May split these out into separate classes in the future.
|
| |
| |
| |
| | |
problem resolution.
|
| | |
|
| | |
|
| |
| |
| |
| | |
more lobe ?
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
|
| |
| |
| |
| |
| |
| | |
ever using the root prim one, store on SOG instead.
This reduces pointless memory usage.
|
| |
| |
| |
| |
| |
| | |
only ever using the root part entry.
This eliminates some pointless memory use.
|
| |
| |
| |
| | |
-1. Not sure if there's a reason for it, but I'm changing it to the given folder type.
|
| |
| |
| |
| | |
do NOT CHANGE THIS, needed for HG 2.0)
|
|\ \
| | |
| | |
| | | |
careminster
|
| | |
| | |
| | |
| | | |
do NOT CHANGE THIS, needed for HG 2.0)
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| | |
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Tests/Common/Mock/TestClient.cs
|
| |
| |
| |
| | |
listeners, these are redundant. Replace a few magic numbers with FriendRights enum already used elsewhere.
|
| |
| |
| |
| |
| |
| |
| | |
caching.
This adds ScenePresence to IClientAPI.SceneAgent earlier on in the add client process so that its information is available to EventManager.OnNewClient() and OnClientLogin()
Also add a code comment as to why we're caching friend information for child agents.
|
| |
| |
| |
| |
| |
| |
| |
| | |
functions require caching for child agents."
We need to cache child agents so that friends object edit/delete permissions will work across boarders on regions hosted by different simulators.
This reverts commit d9f7b8549b3cb9699eb8bd54242d31aac0f8241a.
|
|\ \
| |/
| |
| |
| | |
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
|
| |
| |
| |
| |
| |
| |
| |
| | |
require caching for child agents.
This allows us to avoid unnecessary multiple calls to the friends service.
All friends functions originate from the root agent and only go to other root agents in existing code.
This also allows us to eliminate complex ref counting.
|
| | |
|
| | |
|
|\ \
| |/ |
|
| | |
|
|\ \
| |/ |
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
OpenSim/Framework/Client/IClientInventory.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
|
| | |
|
| |
| |
| |
| | |
folders from the viewer's inventory view. For HG v2.0. More to come
|
| |
| |
| |
| | |
folders from the viewer's inventory view. For HG v2.0. More to come
|
|\ \
| |/
| |
| |
| | |
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
|
| |
| |
| |
| | |
creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
|
| |
| |
| |
| |
| |
| |
| |
| | |
AvatarAnimations, load just in AvatarAnimations instead.
This lets us remove the dependency of OpenSim.Framework.dll on data/avataranimations.xml, which is not necessary for ROBUST.
This commit also takes care of the odd situation where animations are stored and used internally with uppercase names (e.g. "STAND")
but scripts refer to them with lowercase names (e.g. "sit").
|
|\ \
| |/
| |
| |
| | |
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
analysis and stat accuracy.
Update() now accepts a frames parameter which can control the number of frames updated.
-1 will update until shutdown.
The watchdog updating moves above the maintc recalculation for any required sleep since it should be accounted for within the frame.
|
| |
| |
| |
| | |
incomple and there should be a better away )
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
For now on caps/EventQueue, and still only used on a material change...
|
| |
| |
| |
| | |
not and use it on unlink if new root part as type none. Viewer doesn't get updated even with fullupdates we are missing something still
|
| | |
|
|\ \ |
|
| | |
| | |
| | |
| | | |
to SOP including SOPserialization (not to databases). No action on physics still. No send to viewer, etc
|
|/ /
| |
| |
| | |
yet because the parameters are not actually stored anywhere yet.
|
| |
| |
| |
| |
| | |
ObjectChnageWhat what into ObjectChangeType change. What is
no name for a variable or type!
|
|\ \ |
|
| |\ \ |
|