Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Justin Clark-Casey (justincc) 2011-06-02 21:48:50 +0100
committer: Justin Clark-Casey (justincc) 2011-06-02 21:48:50 +0100
commit: b8e2ee69785e8f114748ab9f08cb34b45abde456 (patch)
tree: 1294b2fb6730eebef863f220e782136aa48aa08f /bin
parent: minor: add ini.example doc to hint that the server address in [FreeswitchServ... (diff)
parent: HG IM: increase the timeout value (diff)
download: opensim-SC_OLD-b8e2ee69785e8f114748ab9f08cb34b45abde456.zip
opensim-SC_OLD-b8e2ee69785e8f114748ab9f08cb34b45abde456.tar.gz
opensim-SC_OLD-b8e2ee69785e8f114748ab9f08cb34b45abde456.tar.bz2
opensim-SC_OLD-b8e2ee69785e8f114748ab9f08cb34b45abde456.tar.xz
4 files changed, 4 insertions, 4 deletions
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index baadbb8..5220573 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -27,7 +27,7 @@
    SimulationServiceInConnector        = true
    LibraryModule                                       = true
-[Profiles]
+[Profile]
    Module = "BasicProfileModule"
 [SimulationDataStore]
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 510a315..b8e66c2 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -31,7 +31,7 @@
    SimulationServiceInConnector        = true
    LibraryModule                                       = true
-[Profiles]
+[Profile]
    Module = "BasicProfileModule"
 [SimulationDataStore]
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index cfcf5ed..4ff1a26 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -22,7 +22,7 @@
    LLLoginServiceInConnector  = true
    GridInfoServiceInConnector = true
-[Profiles]
+[Profile]
    Module = "BasicProfileModule"
 [SimulationDataStore]
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 44ca3ac..574375e 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -32,7 +32,7 @@
    AuthenticationServiceInConnector    = true
    SimulationServiceInConnector                = true
-[Profiles]
+[Profile]
    Module = "BasicProfileModule"
 [Messaging]
author	Justin Clark-Casey (justincc)	2011-06-02 21:48:50 +0100
committer	Justin Clark-Casey (justincc)	2011-06-02 21:48:50 +0100
commit	b8e2ee69785e8f114748ab9f08cb34b45abde456 (patch)
tree	1294b2fb6730eebef863f220e782136aa48aa08f /bin
parent	minor: add ini.example doc to hint that the server address in [FreeswitchServ... (diff)
parent	HG IM: increase the timeout value (diff)
download	opensim-SC_OLD-b8e2ee69785e8f114748ab9f08cb34b45abde456.zip opensim-SC_OLD-b8e2ee69785e8f114748ab9f08cb34b45abde456.tar.gz opensim-SC_OLD-b8e2ee69785e8f114748ab9f08cb34b45abde456.tar.bz2 opensim-SC_OLD-b8e2ee69785e8f114748ab9f08cb34b45abde456.tar.xz

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index baadbb8..5220573 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini
@@ -27,7 +27,7 @@
27	SimulationServiceInConnector = true	27	SimulationServiceInConnector = true
28	LibraryModule = true	28	LibraryModule = true
29		29
30	[Profiles]	30	[Profile]
31	Module = "BasicProfileModule"	31	Module = "BasicProfileModule"
32		32
33	[SimulationDataStore]	33	[SimulationDataStore]


diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 510a315..b8e66c2 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini
@@ -31,7 +31,7 @@
31	SimulationServiceInConnector = true	31	SimulationServiceInConnector = true
32	LibraryModule = true	32	LibraryModule = true
33		33
34	[Profiles]	34	[Profile]
35	Module = "BasicProfileModule"	35	Module = "BasicProfileModule"
36		36
37	[SimulationDataStore]	37	[SimulationDataStore]


diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index cfcf5ed..4ff1a26 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini
@@ -22,7 +22,7 @@
22	LLLoginServiceInConnector = true	22	LLLoginServiceInConnector = true
23	GridInfoServiceInConnector = true	23	GridInfoServiceInConnector = true
24		24
25	[Profiles]	25	[Profile]
26	Module = "BasicProfileModule"	26	Module = "BasicProfileModule"
27		27
28	[SimulationDataStore]	28	[SimulationDataStore]


diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 44ca3ac..574375e 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini
@@ -32,7 +32,7 @@
32	AuthenticationServiceInConnector = true	32	AuthenticationServiceInConnector = true
33	SimulationServiceInConnector = true	33	SimulationServiceInConnector = true
34		34
35	[Profiles]	35	[Profile]
36	Module = "BasicProfileModule"	36	Module = "BasicProfileModule"
37		37
38	[Messaging]	38	[Messaging]