![]() 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 |
||
---|---|---|
.. | ||
GatekeeperService.cs | ||
HGAssetService.cs | ||
HGFriendsService.cs | ||
HGInstantMessageService.cs | ||
HGInventoryService.cs | ||
HGSuitcaseInventoryService.cs | ||
UserAccountCache.cs | ||
UserAgentService.cs |