75c68fa29e
Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs |
||
---|---|---|
.. | ||
BulletSim.dll | ||
libBulletSim.so | ||
libode-x86_64.so | ||
libode.dylib | ||
libopenjpeg-dotnet-x86_64.so | ||
libopenjpeg-dotnet.dylib | ||
libsqlite3.dylib | ||
libsqlite3_64.so | ||
ode.dll | ||
sqlite3.dll |