aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2010-08-08 18:24:33 +0100
committerMelanie2010-08-08 18:24:33 +0100
commit321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2 (patch)
treefe6321cf65640d1e6c9fd94b65a3cf5981470204 /bin
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parentAdd distance sort for null, too (diff)
downloadopensim-SC_OLD-321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2.zip
opensim-SC_OLD-321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2.tar.gz
opensim-SC_OLD-321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2.tar.bz2
opensim-SC_OLD-321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'bin')
-rw-r--r--bin/config-include/Standalone.ini1
-rw-r--r--bin/config-include/StandaloneCommon.ini.example44
-rw-r--r--bin/config-include/StandaloneHypergrid.ini1
3 files changed, 46 insertions, 0 deletions
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 6b7dc50..eae9801 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -20,6 +20,7 @@
20 20
21 LibraryModule = true 21 LibraryModule = true
22 LLLoginServiceInConnector = true 22 LLLoginServiceInConnector = true
23 GridInfoServiceInConnector = true
23 24
24[AssetService] 25[AssetService]
25 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" 26 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 9d1c884..f862960 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -76,3 +76,47 @@
76 ; If false, HG TPs happen only to the Default regions specified in [GridService] section 76 ; If false, HG TPs happen only to the Default regions specified in [GridService] section
77 AllowTeleportsToAnyRegion = true 77 AllowTeleportsToAnyRegion = true
78 78
79[GridInfoService]
80 ; These settings are used to return information on a get_grid_info call.
81 ; Client launcher scripts and third-party clients make use of this to
82 ; autoconfigure the client and to provide a nice user experience. If you
83 ; want to facilitate that, you should configure the settings here according
84 ; to your grid or standalone setup.
85 ;
86 ; See http://opensimulator.org/wiki/GridInfo
87
88 ; login uri: for grid this is the login server URI
89 login = http://127.0.0.1:9000/
90
91 ; long grid name: the long name of your grid
92 gridname = "the lost continent of hippo"
93
94 ; short grid name: the short name of your grid
95 gridnick = "hippogrid"
96
97 ; login page: optional: if it exists it will be used to tell the client to use
98 ; this as splash page
99 ; currently unused
100 ;welcome = http://127.0.0.1/welcome
101
102 ; helper uri: optional: if it exists if will be used to tell the client to use
103 ; this for all economy related things
104 ; currently unused
105 ;economy = http://127.0.0.1:9000/
106
107 ; web page of grid: optional: page providing further information about your grid
108 ; currently unused
109 ;about = http://127.0.0.1/about/
110
111 ; account creation: optional: page providing further information about obtaining
112 ; a user account on your grid
113 ; currently unused
114 ;register = http://127.0.0.1/register
115
116 ; help: optional: page providing further assistance for users of your grid
117 ; currently unused
118 ;help = http://127.0.0.1/help
119
120 ; password help: optional: page providing password assistance for users of your grid
121 ; currently unused
122 ;password = http://127.0.0.1/password
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 35e7da2..317af4b 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -27,6 +27,7 @@
27 NeighbourServiceInConnector = true 27 NeighbourServiceInConnector = true
28 LibraryModule = true 28 LibraryModule = true
29 LLLoginServiceInConnector = true 29 LLLoginServiceInConnector = true
30 GridInfoServiceInConnector = true
30 AuthenticationServiceInConnector = true 31 AuthenticationServiceInConnector = true
31 SimulationServiceInConnector = true 32 SimulationServiceInConnector = true
32 33