1f32730798
Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.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 |