diff options
| author | Justin Clark-Casey (justincc) | 2010-06-04 18:00:48 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-06-04 18:00:48 +0100 |
| commit | 2f6d401db13b31c6cac7450266dade6e678c8aa6 (patch) | |
| tree | 8ae3f924dfecbea30835d0172ac5464c6b8325b6 /OpenSim/Region/Framework/Scenes | |
| parent | Revert "Next OSG test. Don't remove app domains if they contain running threa... (diff) | |
| parent | switch 0.6.9 flavour to release (diff) | |
| download | opensim-SC-2f6d401db13b31c6cac7450266dade6e678c8aa6.zip opensim-SC-2f6d401db13b31c6cac7450266dade6e678c8aa6.tar.gz opensim-SC-2f6d401db13b31c6cac7450266dade6e678c8aa6.tar.bz2 opensim-SC-2f6d401db13b31c6cac7450266dade6e678c8aa6.tar.xz | |
Merge remote branch 'origin/0.6.9' into 0.6.9-post-fixes
This chiefly brings in the new sqlite adaptor and renames the old one to SQLiteLegacy
Existing configuratios should continue to work without changes unless you are using Mac OSX and mono 2.6 or later, in which case you will need to enable SQLiteLegacy instead. Please se the instructions in OpenSim.ini.example and the relevant config/include .ini files
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index aa724c5..f556b35 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -2646,4 +2646,4 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2646 | m_sceneGraph.LinkObjects(root, children); | 2646 | m_sceneGraph.LinkObjects(root, children); |
| 2647 | } | 2647 | } |
| 2648 | } | 2648 | } |
| 2649 | } | 2649 | } \ No newline at end of file |