![]() Conflicts: OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/UndoState.cs |
||
---|---|---|
.. | ||
Properties | ||
Resources | ||
SQLiteAssetData.cs | ||
SQLiteAuthenticationData.cs | ||
SQLiteAvatarData.cs | ||
SQLiteEstateData.cs | ||
SQLiteFramework.cs | ||
SQLiteFriendsData.cs | ||
SQLiteGenericTableHandler.cs | ||
SQLiteGridUserData.cs | ||
SQLiteInventoryStore.cs | ||
SQLiteSimulationData.cs | ||
SQLiteUserAccountData.cs | ||
SQLiteUtils.cs | ||
SQLiteXInventoryData.cs |