diff options
| author | Melanie | 2013-05-04 01:22:12 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-04 01:22:12 +0100 |
| commit | 3aa83738e2a845d05bb25ab81634d0540971c0bf (patch) | |
| tree | 411d946b817b020c72f3d9a35926215e28bf2d95 /bin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' into bulletsim4 (diff) | |
| download | opensim-SC_OLD-3aa83738e2a845d05bb25ab81634d0540971c0bf.zip opensim-SC_OLD-3aa83738e2a845d05bb25ab81634d0540971c0bf.tar.gz opensim-SC_OLD-3aa83738e2a845d05bb25ab81634d0540971c0bf.tar.bz2 opensim-SC_OLD-3aa83738e2a845d05bb25ab81634d0540971c0bf.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/Robust.HG.ini.example | 2 | ||||
| -rw-r--r-- | bin/Robust.ini.example | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index d74f205..fee2a87 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | ; Modular configurations | 35 | ; Modular configurations |
| 36 | ; Set path to directory for modular ini files... | 36 | ; Set path to directory for modular ini files... |
| 37 | ; The Robust.exe process must have R/W access to the location | 37 | ; The Robust.exe process must have R/W access to the location |
| 38 | ConfigDirectory = "/home/opensim/etc/Configs" | 38 | ConfigDirectory = "." |
| 39 | 39 | ||
| 40 | [ServiceList] | 40 | [ServiceList] |
| 41 | 41 | ||
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index b7b2524..2d5aa8c 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | ; Modular configurations | 27 | ; Modular configurations |
| 28 | ; Set path to directory for modular ini files... | 28 | ; Set path to directory for modular ini files... |
| 29 | ; The Robust.exe process must have R/W access to the location | 29 | ; The Robust.exe process must have R/W access to the location |
| 30 | ConfigDirectory = "/home/opensim/etc/Configs" | 30 | ConfigDirectory = "." |
| 31 | 31 | ||
| 32 | [ServiceList] | 32 | [ServiceList] |
| 33 | AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector" | 33 | AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector" |