diff options
author | Melanie | 2011-10-11 22:14:17 +0100 |
---|---|---|
committer | Melanie | 2011-10-11 22:14:17 +0100 |
commit | 45ce8db5dbbce5d10b0f1ab674cdeff0c6ac3534 (patch) | |
tree | a0b07d5bd41de030915c3426113510fa669a8f37 | |
parent | Merge commit '6f542f73d4aacc0b92c2ebcff84b4ce2c8d9433b' into bigmerge (diff) | |
parent | Revert "uncomment Standalone config in OpenSim.ini.example." (diff) | |
download | opensim-SC_OLD-45ce8db5dbbce5d10b0f1ab674cdeff0c6ac3534.zip opensim-SC_OLD-45ce8db5dbbce5d10b0f1ab674cdeff0c6ac3534.tar.gz opensim-SC_OLD-45ce8db5dbbce5d10b0f1ab674cdeff0c6ac3534.tar.bz2 opensim-SC_OLD-45ce8db5dbbce5d10b0f1ab674cdeff0c6ac3534.tar.xz |
Merge commit '744602f6d170373882cb31155c8c899b43a5339e' into bigmerge
-rw-r--r-- | bin/OpenSim.ini.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 342bce6..c36d2a4 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -740,7 +740,7 @@ | |||
740 | ;; "config-include/StandaloneCommon.ini.example" to "config-include/StandaloneCommon.ini" before | 740 | ;; "config-include/StandaloneCommon.ini.example" to "config-include/StandaloneCommon.ini" before |
741 | ;; editing it to set the database and backend services that OpenSim will use. | 741 | ;; editing it to set the database and backend services that OpenSim will use. |
742 | ;; | 742 | ;; |
743 | Include-Architecture = "config-include/Standalone.ini" | 743 | ; Include-Architecture = "config-include/Standalone.ini" |
744 | ; Include-Architecture = "config-include/StandaloneHypergrid.ini" | 744 | ; Include-Architecture = "config-include/StandaloneHypergrid.ini" |
745 | ; Include-Architecture = "config-include/Grid.ini" | 745 | ; Include-Architecture = "config-include/Grid.ini" |
746 | ; Include-Architecture = "config-include/GridHypergrid.ini" | 746 | ; Include-Architecture = "config-include/GridHypergrid.ini" |