| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
|
| |
| |
| |
| | |
BaseHttpServer.HandleRequest()
|
| | |
|
|\ \
| |/
| |
| |
| | |
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
|
| |
| |
| |
| |
| |
| |
| | |
EstateSettings.IsEstateManagerOrOwner() to reflect what it actually does.
This makes it consistent with other parts of OpenSimulator that are treating ESTATE_MANAGER and ESTATE_OWNER as different entities.
As per opensim-dev mailing list.
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
This flavour is for changes in addition to the 0.7.3-post-fixes branch that are too large to be considered fixes but should be reasonably stable.
This flavour will almost certainly never see a formal release.
|
| |
| |
| |
| | |
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.
|
| |
| |
| |
| | |
Also ass OpenSource header
|
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
ParcelVoiceInfoRequest bug
Viewer 2/3 contains a bug where the viewer will constantly retry ParcelVoiceInfoRequest requests on voice-disabled parcels where voice is otherwise available.
Attempts to fix this server-side have not been successful - sending a non-OK http code (e.g. a 404) just makes the viewer request again immediately.
Dropping the request entirely is a bit better but the viewer still retries after a minute.
Estate settings already enabled voice by default so doing the same for parcels. This only has an effect if you have any voice system active at all.
Ultimately, the re-request bug needs to be fixed viewer-side (LL suffers from the same issue!) but it might be worth implementing the drop request hack.
|
|\ \
| |/ |
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| | |
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
|
|\ \
| |/ |
|
| |
| |
| |
| |
| | |
Forcing uppercase (e.g. help Assets) is too annoying.
Thanks to WhiteStar for pointing this out.
|
| | |
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
|
| | |
|
| |
| |
| |
| |
| |
| | |
DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch."
This reverts commit 6146e7ef258b10888ad7464b72b75cca701e02c9.
|
| |
| |
| |
| | |
Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch.
|
| |
| |
| |
| |
| |
| |
| |
| | |
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").
|
| |
| |
| |
| | |
collection occurs.
|
| |
| |
| |
| |
| |
| | |
selected priority (by distance being the one that makes sense(?). So called fairness serves no usefull purpose. If a region is lagged or user has bad comms, and far objects updates don't arrive, at least nearby thinks do have a chance to keep ticking. Just test on a big region and observe rez order on arrival. lower viewer bandwith helps seeing the diference. No use to put in core since cmic loves the priority scrambling code i comented out."
This reverts commit 68981d01f024f8a46949127e1cc23c81282f5220.
|
| |
| |
| |
| | |
priority (by distance being the one that makes sense(?). So called fairness serves no usefull purpose. If a region is lagged or user has bad comms, and far objects updates don't arrive, at least nearby thinks do have a chance to keep ticking. Just test on a big region and observe rez order on arrival. lower viewer bandwith helps seeing the diference. No use to put in core since cmic loves the priority scrambling code i comented out.
|
|\ \ |
|
| |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
|
| | | |
|
| | | |
|
| | | |
|
| | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
OpenSim/Framework/Util.cs
|
| | | |
| | | |
| | | |
| | | | |
co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
|
|/ / / |
|
|\ \ \
| | |/
| |/|
| | |
| | | |
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.
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/Scene.cs
|
| | |
|
| |
| |
| |
| | |
However, this returns 0 on Mono (at least on 2.6.7)! So not showing if it is zero.
|
| |
| |
| |
| | |
printed out periodically)
|
| |
| |
| |
| | |
This shows the actual amount of RAM being taken up by OpenSimulator (objects + vm overhead)
|
| |
| |
| |
| | |
For now on caps/EventQueue, and still only used on a material change...
|