| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
OpenSim/Tests/Common/Mock/TestClient.cs
|
| |
| |
| |
| | |
Warning - contains a small migration.
|
|\ \
| |/
| |
| |
| | |
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
|
| |
| |
| |
| | |
for consistency.
|
|\ \
| |/ |
|
| | |
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
|
| |\ |
|
| | |
| | |
| | |
| | | |
region store
|
| | |
| | |
| | |
| | | |
(these were originally in 021_RegionStore.sql which I might have forgotton to add 2 years ago).
|
| | |
| | |
| | |
| | | |
attributes
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
from it
This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual
|
| | | |
|
| |/
| |
| |
| |
| |
| |
| |
| | |
This is mostly Bluewall's work but I am also bumping the general version number
OpenSimulator 0.7.5 remains in the release candidate stage.
I'm doing this because master is significantly adding things that will not be in 0.7.5
This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names
and so the exact version match requirement is not in force.
|
|\ \
| |/ |
|
| |
| |
| |
| | |
in mysql, mssql and sqlite database plugins
|
|\ \
| |/
| |
| |
| | |
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
|
| | |
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| | |
possible.
Not doing SQLiteInventoryStore since this is no longer used and should disappear in the future.
|
| |
| |
| |
| | |
have an AssemblyInfo file.
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
moved/created/deleted to match version numbers cached by viewers.
This is done in the way that one would expect (e.g. moving a folder increments version number on both source and destination parent folders).
This should hopefully improve viewer reuse of its cached inventory information.
Currently MySQL only but will be implement for SQLite/MSSQL if there are no issues.
|
|\ \
| |/
| |
| |
| | |
Conflicts:
OpenSim/Framework/LandData.cs
|
| |
| |
| |
| |
| |
| | |
http://opensimulator.org/mantis/view.php?id=6370
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
|
| | | |
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
includes database region store migrations for mssql, mysql, sqlite
enable/disable this module:
Cap_EnvironmentSettings = "localhost" (for enable)
Cap_EnvironmentSettings = "" (for disable) at ClientStack.LindenCaps section (OpenSimDefaults.ini file)
or owerwrite in OpenSim.ini
mantis: http://opensimulator.org/mantis/view.php?id=5860
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
|
| |
| |
| |
| |
| |
| | |
MySQL and MSSQL have it as Sandbox, sqlite as sandbox.
In various different places in every plugin the wrong casing is used...
Consistency, who needs it? Or one day sqlite can change to Sandbox.
|
|\ \
| |/
| |
| | |
Conflicts:
|
| | |
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
|
| | |
|
| | |
|
|\ \
| |/ |
|
| |
| |
| |
| | |
database sqlite mantis: http://opensimulator.org/mantis/view.php?id=5888
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
|
| |
| |
| |
| | |
http://opensimulator.org/mantis/view.php?id=3731
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
|
| |
| |
| |
| |
| |
| | |
http://opensimulator.org/mantis/view.php?id=5869
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
|
| |
| |
| |
| |
| |
| | |
accurately reflects the data sent by the viewer. Add times bans and the
expiration of timed bans.
Warning: Contains a Migration (and nuts)
|
| | |
|
|\ \
| |/ |
|