aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2018-01-03 10:48:38 +0000
committerUbitUmarov2018-01-03 10:48:38 +0000
commit3576d6d7644224531e225d4afea38c654fa0a4b0 (patch)
treeb031c3686c17022444d1d4dc5e2f2b1b715a3f99 /OpenSim
parentfix merge (diff)
parentfix estates URI (diff)
downloadopensim-SC-3576d6d7644224531e225d4afea38c654fa0a4b0.zip
opensim-SC-3576d6d7644224531e225d4afea38c654fa0a4b0.tar.gz
opensim-SC-3576d6d7644224531e225d4afea38c654fa0a4b0.tar.bz2
opensim-SC-3576d6d7644224531e225d4afea38c654fa0a4b0.tar.xz
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MySQL/MySQLUserProfilesData.cs54
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs4
2 files changed, 20 insertions, 38 deletions
diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index c98e017..16637c3 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -112,8 +112,7 @@ namespace OpenSim.Data.MySQL
112 } 112 }
113 catch (Exception e) 113 catch (Exception e)
114 { 114 {
115 m_log.ErrorFormat("[PROFILES_DATA]" + 115 m_log.ErrorFormat("[PROFILES_DATA] GetClassifiedRecords exception {0}", e.Message);
116 ": UserAccount exception {0}", e.Message);
117 } 116 }
118 n.Add("classifieduuid", OSD.FromUUID(Id)); 117 n.Add("classifieduuid", OSD.FromUUID(Id));
119 n.Add("name", OSD.FromString(Name)); 118 n.Add("name", OSD.FromString(Name));
@@ -234,8 +233,7 @@ namespace OpenSim.Data.MySQL
234 } 233 }
235 catch (Exception e) 234 catch (Exception e)
236 { 235 {
237 m_log.ErrorFormat("[PROFILES_DATA]" + 236 m_log.ErrorFormat("[PROFILES_DATA]: UpdateClassifiedRecord exception {0}", e.Message);
238 ": ClassifiedesUpdate exception {0}", e.Message);
239 result = e.Message; 237 result = e.Message;
240 return false; 238 return false;
241 } 239 }
@@ -262,8 +260,7 @@ namespace OpenSim.Data.MySQL
262 } 260 }
263 catch (Exception e) 261 catch (Exception e)
264 { 262 {
265 m_log.ErrorFormat("[PROFILES_DATA]" + 263 m_log.ErrorFormat("[PROFILES_DATA]: DeleteClassifiedRecord exception {0}", e.Message);
266 ": DeleteClassifiedRecord exception {0}", e.Message);
267 return false; 264 return false;
268 } 265 }
269 return true; 266 return true;
@@ -310,8 +307,7 @@ namespace OpenSim.Data.MySQL
310 } 307 }
311 catch (Exception e) 308 catch (Exception e)
312 { 309 {
313 m_log.ErrorFormat("[PROFILES_DATA]" + 310 m_log.ErrorFormat("[PROFILES_DATA]: GetClassifiedInfo exception {0}", e.Message);
314 ": GetPickInfo exception {0}", e.Message);
315 } 311 }
316 return true; 312 return true;
317 } 313 }
@@ -353,8 +349,7 @@ namespace OpenSim.Data.MySQL
353 } 349 }
354 catch (Exception e) 350 catch (Exception e)
355 { 351 {
356 m_log.ErrorFormat("[PROFILES_DATA]" + 352 m_log.ErrorFormat("[PROFILES_DATA]: GetAvatarPicks exception {0}", e.Message);
357 ": GetAvatarPicks exception {0}", e.Message);
358 } 353 }
359 return data; 354 return data;
360 } 355 }
@@ -407,8 +402,7 @@ namespace OpenSim.Data.MySQL
407 } 402 }
408 catch (Exception e) 403 catch (Exception e)
409 { 404 {
410 m_log.ErrorFormat("[PROFILES_DATA]" + 405 m_log.ErrorFormat("[PROFILES_DATA]: GetPickInfo exception {0}", e.Message);
411 ": GetPickInfo exception {0}", e.Message);
412 } 406 }
413 return pick; 407 return pick;
414 } 408 }
@@ -472,8 +466,7 @@ namespace OpenSim.Data.MySQL
472 } 466 }
473 catch (Exception e) 467 catch (Exception e)
474 { 468 {
475 m_log.ErrorFormat("[PROFILES_DATA]" + 469 m_log.ErrorFormat("[PROFILES_DATA]: UpdatePicksRecord exception {0}", e.Message);
476 ": UpdateAvatarNotes exception {0}", e.Message);
477 return false; 470 return false;
478 } 471 }
479 return true; 472 return true;
@@ -500,8 +493,7 @@ namespace OpenSim.Data.MySQL
500 } 493 }
501 catch (Exception e) 494 catch (Exception e)
502 { 495 {
503 m_log.ErrorFormat("[PROFILES_DATA]" + 496 m_log.ErrorFormat("[PROFILES_DATA]: DeletePicksRecord exception {0}", e.Message);
504 ": DeleteUserPickRecord exception {0}", e.Message);
505 return false; 497 return false;
506 } 498 }
507 return true; 499 return true;
@@ -541,8 +533,7 @@ namespace OpenSim.Data.MySQL
541 } 533 }
542 catch (Exception e) 534 catch (Exception e)
543 { 535 {
544 m_log.ErrorFormat("[PROFILES_DATA]" + 536 m_log.ErrorFormat("[PROFILES_DATA]: GetAvatarNotes exception {0}", e.Message);
545 ": GetAvatarNotes exception {0}", e.Message);
546 } 537 }
547 return true; 538 return true;
548 } 539 }
@@ -589,8 +580,7 @@ namespace OpenSim.Data.MySQL
589 } 580 }
590 catch (Exception e) 581 catch (Exception e)
591 { 582 {
592 m_log.ErrorFormat("[PROFILES_DATA]" + 583 m_log.ErrorFormat("[PROFILES_DATA]: UpdateAvatarNotes exception {0}", e.Message);
593 ": UpdateAvatarNotes exception {0}", e.Message);
594 return false; 584 return false;
595 } 585 }
596 return true; 586 return true;
@@ -711,8 +701,7 @@ namespace OpenSim.Data.MySQL
711 } 701 }
712 catch (Exception e) 702 catch (Exception e)
713 { 703 {
714 m_log.ErrorFormat("[PROFILES_DATA]" + 704 m_log.ErrorFormat("[PROFILES_DATA]: GetAvatarProperties exception {0}", e.Message);
715 ": Requst properties exception {0}", e.Message);
716 result = e.Message; 705 result = e.Message;
717 return false; 706 return false;
718 } 707 }
@@ -747,8 +736,7 @@ namespace OpenSim.Data.MySQL
747 } 736 }
748 catch (Exception e) 737 catch (Exception e)
749 { 738 {
750 m_log.ErrorFormat("[PROFILES_DATA]" + 739 m_log.ErrorFormat("[PROFILES_DATA]: UpdateAvatarProperties exception {0}", e.Message);
751 ": AgentPropertiesUpdate exception {0}", e.Message);
752 740
753 return false; 741 return false;
754 } 742 }
@@ -787,8 +775,7 @@ namespace OpenSim.Data.MySQL
787 } 775 }
788 catch (Exception e) 776 catch (Exception e)
789 { 777 {
790 m_log.ErrorFormat("[PROFILES_DATA]" + 778 m_log.ErrorFormat("[PROFILES_DATA]: UpdateAvatarInterests exception {0}", e.Message);
791 ": AgentInterestsUpdate exception {0}", e.Message);
792 result = e.Message; 779 result = e.Message;
793 return false; 780 return false;
794 } 781 }
@@ -870,8 +857,7 @@ namespace OpenSim.Data.MySQL
870 } 857 }
871 catch (Exception e) 858 catch (Exception e)
872 { 859 {
873 m_log.ErrorFormat("[PROFILES_DATA]" + 860 m_log.ErrorFormat("[PROFILES_DATA]: GetUserImageAssets exception {0}", e.Message);
874 ": GetAvatarNotes exception {0}", e.Message);
875 } 861 }
876 return data; 862 return data;
877 } 863 }
@@ -921,8 +907,7 @@ namespace OpenSim.Data.MySQL
921 } 907 }
922 catch (Exception e) 908 catch (Exception e)
923 { 909 {
924 m_log.ErrorFormat("[PROFILES_DATA]" + 910 m_log.ErrorFormat("[PROFILES_DATA]: GetUserPreferences exception {0}", e.Message);
925 ": Get preferences exception {0}", e.Message);
926 result = e.Message; 911 result = e.Message;
927 return false; 912 return false;
928 } 913 }
@@ -954,8 +939,7 @@ namespace OpenSim.Data.MySQL
954 } 939 }
955 catch (Exception e) 940 catch (Exception e)
956 { 941 {
957 m_log.ErrorFormat("[PROFILES_DATA]" + 942 m_log.ErrorFormat("[PROFILES_DATA]: UpdateUserPreferences exception {0} {1}", e.Message, e.InnerException);
958 ": UserPreferencesUpdate exception {0} {1}", e.Message, e.InnerException);
959 result = e.Message; 943 result = e.Message;
960 return false; 944 return false;
961 } 945 }
@@ -1006,8 +990,7 @@ namespace OpenSim.Data.MySQL
1006 } 990 }
1007 catch (Exception e) 991 catch (Exception e)
1008 { 992 {
1009 m_log.ErrorFormat("[PROFILES_DATA]" + 993 m_log.ErrorFormat("[PROFILES_DATA]: GetUserAppData exception {0}", e.Message);
1010 ": Requst application data exception {0}", e.Message);
1011 result = e.Message; 994 result = e.Message;
1012 return false; 995 return false;
1013 } 996 }
@@ -1037,8 +1020,7 @@ namespace OpenSim.Data.MySQL
1037 } 1020 }
1038 catch (Exception e) 1021 catch (Exception e)
1039 { 1022 {
1040 m_log.ErrorFormat("[PROFILES_DATA]" + 1023 m_log.ErrorFormat("[PROFILES_DATA]: SetUserAppData exception {0}", e.Message);
1041 ": SetUserData exception {0}", e.Message);
1042 return false; 1024 return false;
1043 } 1025 }
1044 return true; 1026 return true;
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs b/OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs
index 051ff71..8001c3c 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs
@@ -192,12 +192,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
192 { 192 {
193 string url = ""; 193 string url = "";
194 if(port != 0) 194 if(port != 0)
195 url = "http://" + region.ExternalHostName + ":" + port; 195 url = "http://" + region.ExternalHostName + ":" + port + "/";
196 else 196 else
197 url = region.ServerURI; 197 url = region.ServerURI;
198 198
199 string reply = SynchronousRestFormsRequester.MakeRequest("POST", 199 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
200 url + "/estate", 200 url + "estate",
201 reqString); 201 reqString);
202 if (reply != string.Empty) 202 if (reply != string.Empty)
203 { 203 {
generated by cgit v1.1 at 2024-11-16 20:58:10 +0000