| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|\ \ \
| |/ /
| | |
| | |
| | | |
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
|
| | | |
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | | |
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
|
| | | |
|
| | |
| | |
| | |
| | | |
Refactor: eq message logging into common method.
|
| | |
| | |
| | |
| | | |
some local variables in line with code conventions. Add commented out EQG log lines for future use.
|
|\ \ \
| | |/
| |/| |
|
| | |
| | |
| | |
| | | |
sent. Use the safer lower max packet size defined in os source (600) and not OMV one (1100).
|
|\ \ \
| |/ / |
|
| | |
| | |
| | |
| | | |
parameters to define if to add or remove, and if to send anims pack on that evocation, etc
|
|\ \ \
| | |/
| |/| |
|
| | |
| | |
| | |
| | | |
This adds name and description of the request handler to http request logging when DebugLevel >= 1
|
|\ \ \
| | |/
| |/| |
|
| | | |
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
|
| | |
| | |
| | |
| | |
| | |
| | | |
can relate a slow request to what the handler actually does and the agent it serves, if applicable.
This is most useful for capabilities where the url is not self-describing.
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
simulator
This adds a non-advertised wait_for_callback option in [EntityTransfer]. Default is always true.
Teleport tests disable the wait for callback from the destination region in order to run within a single thread.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
design,""
This reverts commit a90b0e302c110068cec0ee7109e796d2d5fdab4d.
Sorry, accidentally reverted this completely by mistake, reverting the revert.
|
| | |
| | |
| | |
| | | |
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
|