aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs2
-rw-r--r--bin/OpenSim.Server.HG.ini.example47
-rw-r--r--bin/OpenSim.Server.ini.example46
-rw-r--r--bin/OpenSim.ini.example46
4 files changed, 94 insertions, 47 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 143e5f1..1d734eb 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -251,7 +251,7 @@ namespace OpenSim.Services.LLLoginService
251 } 251 }
252 catch (Exception e) 252 catch (Exception e)
253 { 253 {
254 m_log.WarnFormat("[LLOGIN SERVICE]: Exception processing login for {0} {1}: {2}", firstName, lastName, e.ToString()); 254 m_log.WarnFormat("[LLOGIN SERVICE]: Exception processing login for {0} {1}: {2} {3}", firstName, lastName, e.ToString(), e.StackTrace);
255 if (m_PresenceService != null) 255 if (m_PresenceService != null)
256 m_PresenceService.LogoutAgent(session, new Vector3(128, 128, 0), new Vector3(0, 1, 0)); 256 m_PresenceService.LogoutAgent(session, new Vector3(128, 128, 0), new Vector3(0, 1, 0));
257 return LLFailedLoginResponse.InternalError; 257 return LLFailedLoginResponse.InternalError;
diff --git a/bin/OpenSim.Server.HG.ini.example b/bin/OpenSim.Server.HG.ini.example
index 97c2e06..5e3f9a7 100644
--- a/bin/OpenSim.Server.HG.ini.example
+++ b/bin/OpenSim.Server.HG.ini.example
@@ -133,6 +133,52 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
133 InventoryServerURI = "http://127.0.0.1:8002" 133 InventoryServerURI = "http://127.0.0.1:8002"
134 AssetServerURI = "http://127.0.0.1:8002" 134 AssetServerURI = "http://127.0.0.1:8002"
135 135
136[GridInfoService]
137 ; These settings are used to return information on a get_grid_info call.
138 ; Client launcher scripts and third-party clients make use of this to
139 ; autoconfigure the client and to provide a nice user experience. If you
140 ; want to facilitate that, you should configure the settings here according
141 ; to your grid or standalone setup.
142 ;
143 ; See http://opensimulator.org/wiki/GridInfo
144
145 ; login uri: for grid this is the login server URI
146 login = http://127.0.0.1:9000/
147
148 ; long grid name: the long name of your grid
149 gridname = "the lost continent of hippo"
150
151 ; short grid name: the short name of your grid
152 gridnick = "hippogrid"
153
154 ; login page: optional: if it exists it will be used to tell the client to use
155 ; this as splash page
156 ; currently unused
157 ;welcome = http://127.0.0.1/welcome
158
159 ; helper uri: optional: if it exists if will be used to tell the client to use
160 ; this for all economy related things
161 ; currently unused
162 ;economy = http://127.0.0.1:9000/
163
164 ; web page of grid: optional: page providing further information about your grid
165 ; currently unused
166 ;about = http://127.0.0.1/about/
167
168 ; account creation: optional: page providing further information about obtaining
169 ; a user account on your grid
170 ; currently unused
171 ;register = http://127.0.0.1/register
172
173 ; help: optional: page providing further assistance for users of your grid
174 ; currently unused
175 ;help = http://127.0.0.1/help
176
177 ; password help: optional: page providing password assistance for users of your grid
178 ; currently unused
179 ;password = http://127.0.0.1/password
180
181
136[GatekeeperService] 182[GatekeeperService]
137 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" 183 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
138 ;; for the service 184 ;; for the service
@@ -160,3 +206,4 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
160[HGInventoryService] 206[HGInventoryService]
161 ; For the InventoryServiceInConnector 207 ; For the InventoryServiceInConnector
162 LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService" 208 LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService"
209
diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index e822e83..9bedac6 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -127,3 +127,49 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
127 FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" 127 FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
128 128
129 WelcomeMessage = "Welcome, Avatar!" 129 WelcomeMessage = "Welcome, Avatar!"
130
131
132[GridInfoService]
133 ; These settings are used to return information on a get_grid_info call.
134 ; Client launcher scripts and third-party clients make use of this to
135 ; autoconfigure the client and to provide a nice user experience. If you
136 ; want to facilitate that, you should configure the settings here according
137 ; to your grid or standalone setup.
138 ;
139 ; See http://opensimulator.org/wiki/GridInfo
140
141 ; login uri: for grid this is the login server URI
142 login = http://127.0.0.1:9000/
143
144 ; long grid name: the long name of your grid
145 gridname = "the lost continent of hippo"
146
147 ; short grid name: the short name of your grid
148 gridnick = "hippogrid"
149
150 ; login page: optional: if it exists it will be used to tell the client to use
151 ; this as splash page
152 ; currently unused
153 ;welcome = http://127.0.0.1/welcome
154
155 ; helper uri: optional: if it exists if will be used to tell the client to use
156 ; this for all economy related things
157 ; currently unused
158 ;economy = http://127.0.0.1:9000/
159
160 ; web page of grid: optional: page providing further information about your grid
161 ; currently unused
162 ;about = http://127.0.0.1/about/
163
164 ; account creation: optional: page providing further information about obtaining
165 ; a user account on your grid
166 ; currently unused
167 ;register = http://127.0.0.1/register
168
169 ; help: optional: page providing further assistance for users of your grid
170 ; currently unused
171 ;help = http://127.0.0.1/help
172
173 ; password help: optional: page providing password assistance for users of your grid
174 ; currently unused
175 ;password = http://127.0.0.1/password
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 020632f..309ce88 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -979,52 +979,6 @@
979 ; DisableUndergroundMovement = true 979 ; DisableUndergroundMovement = true
980 980
981 981
982[GridInfoService]
983 ; These settings are used to return information on a get_grid_info call.
984 ; Client launcher scripts and third-party clients make use of this to
985 ; autoconfigure the client and to provide a nice user experience. If you
986 ; want to facilitate that, you should configure the settings here according
987 ; to your grid or standalone setup.
988 ;
989 ; See http://opensimulator.org/wiki/GridInfo
990
991 ; login uri: for grid this is the user server URI
992 login = http://127.0.0.1:9000/
993
994 ; long grid name: the long name of your grid
995 gridname = "the lost continent of hippo"
996
997 ; short grid name: the short name of your grid
998 gridnick = "hippogrid"
999
1000 ; login page: optional: if it exists it will be used to tell the client to use
1001 ; this as splash page
1002 ; currently unused
1003 ;welcome = http://127.0.0.1/welcome
1004
1005 ; helper uri: optional: if it exists if will be used to tell the client to use
1006 ; this for all economy related things
1007 ; currently unused
1008 ;economy = http://127.0.0.1:9000/
1009
1010 ; web page of grid: optional: page providing further information about your grid
1011 ; currently unused
1012 ;about = http://127.0.0.1/about/
1013
1014 ; account creation: optional: page providing further information about obtaining
1015 ; a user account on your grid
1016 ; currently unused
1017 ;register = http://127.0.0.1/register
1018
1019 ; help: optional: page providing further assistance for users of your grid
1020 ; currently unused
1021 ;help = http://127.0.0.1/help
1022
1023 ; password help: optional: page providing password assistance for users of your grid
1024 ; currently unused
1025 ;password = http://127.0.0.1/password
1026
1027
1028[OpenGridProtocol] 982[OpenGridProtocol]
1029 ;These are the settings for the Open Grid Protocol.. the Agent Domain, Region Domain, you know.. 983 ;These are the settings for the Open Grid Protocol.. the Agent Domain, Region Domain, you know..
1030 ;On/true or Off/false 984 ;On/true or Off/false