| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
| |
|
|
|
|
| |
wearables) that reference assets, and user does not have permissions on those, abort and warn, instead of silent invalition of the references to those assets, creating a broken item
|
|
|
|
|
| |
except on SceneBanner, later it my be also removed from there and
everywhere
|
| |
|
|
|
|
|
|
| |
Also fixes some merge artefacts in HGAssetBroker where cached assets
were requested but not actually used and completely squelch a materials
debug message because there is nothing the user can do to fix it anyway.
|
|
|
|
|
| |
Create a class GodController which controls all aspects of god level,
viewer modes and user levels at ScenePresence level.
|
| |
|
|
|
|
| |
is long gone.
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
(opened xfers also need a timeout) (not pretty code, but should not have heavy use)
|
|
|
|
| |
Make inventory items reflect coorect permissions immediately unstead of after relog
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
will not work anyway
|
| |
|
|
|
|
| |
Protocol seems to have also a callbackID on this, apparently ignored by viewers ( as possible the transactionID )
|
|
|
|
| |
InventoryService.UpdateItem call in case of m_uploadState is complete. In that case CompleteItemUpload will do it
|
| |
|
|\ |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
|
| | | |
| | | |
| | | |
| | | | |
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | | |
textures
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
sends an asset transaciton but it is empty. So we can't ignore name data
when a transaction is present and can't treat every transaction as valid.
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
|
| |\ \ \ \ \ \
| | |_|_|/ / /
| |/| | | | |
| | | | | | |
| | | | | | | |
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
|
| |\ \ \ \ \ \ |
|
| | | | | | | | |
|
| |\ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
|
| |\ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
|
| |\ \ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
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
|
| |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
|
| |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
|
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|/ / / / / /
| | |/| | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
Conflicts:
OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
OpenSim/Region/Framework/Scenes/Scene.cs
|