aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-06-14 23:55:36 +0100
committerJustin Clark-Casey (justincc)2013-06-14 23:58:16 +0100
commitdb9d9d83ebdaedbe74c66d849e204ea7c9ae8d6c (patch)
tree759e73b2a5274b404922090db4e27cf8bdfa75a4
parentDon't try to abort worker threads in WebFetchInvDescModule if module was not ... (diff)
parentMerge branch 'master' of /home/opensim/src/opensim (diff)
downloadopensim-SC_OLD-db9d9d83ebdaedbe74c66d849e204ea7c9ae8d6c.zip
opensim-SC_OLD-db9d9d83ebdaedbe74c66d849e204ea7c9ae8d6c.tar.gz
opensim-SC_OLD-db9d9d83ebdaedbe74c66d849e204ea7c9ae8d6c.tar.bz2
opensim-SC_OLD-db9d9d83ebdaedbe74c66d849e204ea7c9ae8d6c.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Region/DataSnapshot/DataRequestHandler.cs4
-rw-r--r--OpenSim/Region/DataSnapshot/SnapshotStore.cs12
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginResponse.cs18
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs4
-rw-r--r--bin/Robust.HG.ini.example3
-rw-r--r--bin/Robust.ini.example3
-rw-r--r--bin/config-include/StandaloneCommon.ini.example3
7 files changed, 37 insertions, 10 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
index 32e93b4..50276ae 100644
--- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
+++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.DataSnapshot
63 63
64 public Hashtable OnGetSnapshot(Hashtable keysvals) 64 public Hashtable OnGetSnapshot(Hashtable keysvals)
65 { 65 {
66 m_log.Info("[DATASNAPSHOT] Received collection request"); 66 m_log.Debug("[DATASNAPSHOT] Received collection request");
67 Hashtable reply = new Hashtable(); 67 Hashtable reply = new Hashtable();
68 int statuscode = 200; 68 int statuscode = 200;
69 69
@@ -80,7 +80,7 @@ namespace OpenSim.Region.DataSnapshot
80 80
81 public Hashtable OnValidate(Hashtable keysvals) 81 public Hashtable OnValidate(Hashtable keysvals)
82 { 82 {
83 m_log.Info("[DATASNAPSHOT] Received validation request"); 83 m_log.Debug("[DATASNAPSHOT] Received validation request");
84 Hashtable reply = new Hashtable(); 84 Hashtable reply = new Hashtable();
85 int statuscode = 200; 85 int statuscode = 200;
86 86
diff --git a/OpenSim/Region/DataSnapshot/SnapshotStore.cs b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
index aa3d2ff..480aaaf 100644
--- a/OpenSim/Region/DataSnapshot/SnapshotStore.cs
+++ b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
@@ -120,7 +120,7 @@ namespace OpenSim.Region.DataSnapshot
120 provider.Stale = false; 120 provider.Stale = false;
121 m_scenes[provider.GetParentScene] = true; 121 m_scenes[provider.GetParentScene] = true;
122 122
123 m_log.Info("[DATASNAPSHOT]: Generated fragment response for provider type " + provider.Name); 123 m_log.Debug("[DATASNAPSHOT]: Generated fragment response for provider type " + provider.Name);
124 } 124 }
125 else 125 else
126 { 126 {
@@ -134,7 +134,7 @@ namespace OpenSim.Region.DataSnapshot
134 data = factory.ImportNode(node, true); 134 data = factory.ImportNode(node, true);
135 } 135 }
136 136
137 m_log.Info("[DATASNAPSHOT]: Retrieved fragment response for provider type " + provider.Name); 137 m_log.Debug("[DATASNAPSHOT]: Retrieved fragment response for provider type " + provider.Name);
138 } 138 }
139 139
140 return data; 140 return data;
@@ -154,7 +154,7 @@ namespace OpenSim.Region.DataSnapshot
154 154
155 if (!m_scenes[scene]) 155 if (!m_scenes[scene])
156 { 156 {
157 m_log.Info("[DATASNAPSHOT]: Attempting to retrieve snapshot from cache."); 157 m_log.Debug("[DATASNAPSHOT]: Attempting to retrieve snapshot from cache.");
158 //get snapshot from cache 158 //get snapshot from cache
159 String path = DataFileNameScene(scene); 159 String path = DataFileNameScene(scene);
160 160
@@ -168,11 +168,11 @@ namespace OpenSim.Region.DataSnapshot
168 regionElement = factory.ImportNode(node, true); 168 regionElement = factory.ImportNode(node, true);
169 } 169 }
170 170
171 m_log.Info("[DATASNAPSHOT]: Obtained snapshot from cache for " + scene.RegionInfo.RegionName); 171 m_log.Debug("[DATASNAPSHOT]: Obtained snapshot from cache for " + scene.RegionInfo.RegionName);
172 } 172 }
173 else 173 else
174 { 174 {
175 m_log.Info("[DATASNAPSHOT]: Attempting to generate snapshot."); 175 m_log.Debug("[DATASNAPSHOT]: Attempting to generate snapshot.");
176 //make snapshot 176 //make snapshot
177 regionElement = MakeRegionNode(scene, factory); 177 regionElement = MakeRegionNode(scene, factory);
178 178
@@ -211,7 +211,7 @@ namespace OpenSim.Region.DataSnapshot
211 211
212 m_scenes[scene] = false; 212 m_scenes[scene] = false;
213 213
214 m_log.Info("[DATASNAPSHOT]: Generated new snapshot for " + scene.RegionInfo.RegionName); 214 m_log.Debug("[DATASNAPSHOT]: Generated new snapshot for " + scene.RegionInfo.RegionName);
215 } 215 }
216 216
217 return regionElement; 217 return regionElement;
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 400f303..6ab5258 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -190,6 +190,7 @@ namespace OpenSim.Services.LLLoginService
190 private BuddyList m_buddyList = null; 190 private BuddyList m_buddyList = null;
191 191
192 private string currency; 192 private string currency;
193 private string classifiedFee;
193 194
194 static LLLoginResponse() 195 static LLLoginResponse()
195 { 196 {
@@ -227,7 +228,7 @@ namespace OpenSim.Services.LLLoginService
227 GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, 228 GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
228 string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, 229 string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
229 GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency, 230 GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency,
230 string DSTZone, string destinationsURL, string avatarsURL) 231 string DSTZone, string destinationsURL, string avatarsURL, string classifiedFee)
231 : this() 232 : this()
232 { 233 {
233 FillOutInventoryData(invSkel, libService); 234 FillOutInventoryData(invSkel, libService);
@@ -251,6 +252,8 @@ namespace OpenSim.Services.LLLoginService
251 252
252 SearchURL = searchURL; 253 SearchURL = searchURL;
253 Currency = currency; 254 Currency = currency;
255 ClassifiedFee = classifiedFee;
256
254 257
255 FillOutHomeData(pinfo, home); 258 FillOutHomeData(pinfo, home);
256 LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z); 259 LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z);
@@ -463,6 +466,7 @@ namespace OpenSim.Services.LLLoginService
463 searchURL = String.Empty; 466 searchURL = String.Empty;
464 467
465 currency = String.Empty; 468 currency = String.Empty;
469 ClassifiedFee = "0";
466 } 470 }
467 471
468 472
@@ -555,6 +559,9 @@ namespace OpenSim.Services.LLLoginService
555 // responseData["real_currency"] = currency; 559 // responseData["real_currency"] = currency;
556 responseData["currency"] = currency; 560 responseData["currency"] = currency;
557 } 561 }
562
563 if (ClassifiedFee != String.Empty)
564 responseData["classified_fee"] = ClassifiedFee;
558 565
559 responseData["login"] = "true"; 566 responseData["login"] = "true";
560 567
@@ -659,6 +666,9 @@ namespace OpenSim.Services.LLLoginService
659 if (searchURL != String.Empty) 666 if (searchURL != String.Empty)
660 map["search"] = OSD.FromString(searchURL); 667 map["search"] = OSD.FromString(searchURL);
661 668
669 if (ClassifiedFee != String.Empty)
670 map["classified_fee"] = OSD.FromString(ClassifiedFee);
671
662 if (m_buddyList != null) 672 if (m_buddyList != null)
663 { 673 {
664 map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray()); 674 map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray());
@@ -1064,6 +1074,12 @@ namespace OpenSim.Services.LLLoginService
1064 set { currency = value; } 1074 set { currency = value; }
1065 } 1075 }
1066 1076
1077 public string ClassifiedFee
1078 {
1079 get { return classifiedFee; }
1080 set { classifiedFee = value; }
1081 }
1082
1067 public string DestinationsURL 1083 public string DestinationsURL
1068 { 1084 {
1069 get; set; 1085 get; set;
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index abda98f..10cf90f 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -78,6 +78,7 @@ namespace OpenSim.Services.LLLoginService
78 protected string m_OpenIDURL; 78 protected string m_OpenIDURL;
79 protected string m_SearchURL; 79 protected string m_SearchURL;
80 protected string m_Currency; 80 protected string m_Currency;
81 protected string m_ClassifiedFee;
81 protected string m_DestinationGuide; 82 protected string m_DestinationGuide;
82 protected string m_AvatarPicker; 83 protected string m_AvatarPicker;
83 84
@@ -119,6 +120,7 @@ namespace OpenSim.Services.LLLoginService
119 m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty); 120 m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty);
120 m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); 121 m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty);
121 m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); 122 m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty);
123 m_ClassifiedFee = m_LoginServerConfig.GetString("ClassifiedFee", string.Empty);
122 m_DestinationGuide = m_LoginServerConfig.GetString ("DestinationGuide", string.Empty); 124 m_DestinationGuide = m_LoginServerConfig.GetString ("DestinationGuide", string.Empty);
123 m_AvatarPicker = m_LoginServerConfig.GetString ("AvatarPicker", string.Empty); 125 m_AvatarPicker = m_LoginServerConfig.GetString ("AvatarPicker", string.Empty);
124 126
@@ -458,7 +460,7 @@ namespace OpenSim.Services.LLLoginService
458 account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, 460 account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
459 where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, 461 where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP,
460 m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone, 462 m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone,
461 m_DestinationGuide, m_AvatarPicker); 463 m_DestinationGuide, m_AvatarPicker, m_ClassifiedFee);
462 464
463 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName); 465 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName);
464 466
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index d9f1ca1..466aed2 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -311,6 +311,9 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
311 ;; Ask co-operative viewers to use a different currency name 311 ;; Ask co-operative viewers to use a different currency name
312 ;Currency = "" 312 ;Currency = ""
313 313
314 ;; Set minimum fee to publish classified
315 ; ClassifiedFee = 0
316
314 WelcomeMessage = "Welcome, Avatar!" 317 WelcomeMessage = "Welcome, Avatar!"
315 AllowRemoteSetLoginLevel = "false" 318 AllowRemoteSetLoginLevel = "false"
316 319
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 7d6492b..da1b43a 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -274,6 +274,9 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
274 ; Ask co-operative viewers to use a different currency name 274 ; Ask co-operative viewers to use a different currency name
275 ;Currency = "" 275 ;Currency = ""
276 276
277 ;; Set minimum fee to publish classified
278 ; ClassifiedFee = 0
279
277 WelcomeMessage = "Welcome, Avatar!" 280 WelcomeMessage = "Welcome, Avatar!"
278 AllowRemoteSetLoginLevel = "false" 281 AllowRemoteSetLoginLevel = "false"
279 282
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 8c23c41..6b991a8 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -115,6 +115,9 @@
115 ;; Ask co-operative viewers to use a different currency name 115 ;; Ask co-operative viewers to use a different currency name
116 ;Currency = "" 116 ;Currency = ""
117 117
118 ;; Set minimum fee to publish classified
119 ; ClassifiedFee = 0
120
118 ;; Regular expressions for controlling which client versions are accepted/denied. 121 ;; Regular expressions for controlling which client versions are accepted/denied.
119 ;; An empty string means nothing is checked. 122 ;; An empty string means nothing is checked.
120 ;; 123 ;;