aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1
diff options
context:
space:
mode:
authorJeff Ames2008-05-16 01:22:11 +0000
committerJeff Ames2008-05-16 01:22:11 +0000
commit65c5efe43b68700bad94076d4cd421160203c5de (patch)
tree589b56649ed02f4942671fd6e51c6dc43f682e0d /OpenSim/Region/Communications/OGS1
parentThank you very much, mjm for : (diff)
downloadopensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.zip
opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.tar.gz
opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.tar.bz2
opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.tar.xz
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Communications/OGS1')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs132
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs84
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs42
-rw-r--r--OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs10
4 files changed, 134 insertions, 134 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index fb8dcf6..5e7e238 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -95,9 +95,9 @@ namespace OpenSim.Region.Communications.OGS1
95 public RegionCommsListener RegisterRegion(RegionInfo regionInfo) 95 public RegionCommsListener RegisterRegion(RegionInfo regionInfo)
96 { 96 {
97 m_log.InfoFormat( 97 m_log.InfoFormat(
98 "[OGS1 GRID SERVICES]: Attempting to register region {0} with grid at {1}", 98 "[OGS1 GRID SERVICES]: Attempting to register region {0} with grid at {1}",
99 regionInfo.RegionName, serversInfo.GridURL); 99 regionInfo.RegionName, serversInfo.GridURL);
100 100
101 Hashtable GridParams = new Hashtable(); 101 Hashtable GridParams = new Hashtable();
102 // Login / Authentication 102 // Login / Authentication
103 103
@@ -122,7 +122,7 @@ namespace OpenSim.Region.Communications.OGS1
122 // not at all. Current strategy is to put the code in place to support the validity of this information 122 // not at all. Current strategy is to put the code in place to support the validity of this information
123 // and to roll forward debugging any issues from that point 123 // and to roll forward debugging any issues from that point
124 // 124 //
125 // this particular section of the mod attempts to supply a value from the region's xml file to the grid 125 // this particular section of the mod attempts to supply a value from the region's xml file to the grid
126 // server for the UUID of the region's owner (master avatar) 126 // server for the UUID of the region's owner (master avatar)
127 GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString(); 127 GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString();
128 128
@@ -139,14 +139,14 @@ namespace OpenSim.Region.Communications.OGS1
139 } 139 }
140 catch (Exception e) 140 catch (Exception e)
141 { 141 {
142 Exception e2 142 Exception e2
143 = new Exception( 143 = new Exception(
144 String.Format("Unable to connect to grid at {0}. Grid service not running?", serversInfo.GridURL), 144 String.Format("Unable to connect to grid at {0}. Grid service not running?", serversInfo.GridURL),
145 e); 145 e);
146 146
147 throw(e2); 147 throw(e2);
148 } 148 }
149 149
150 Hashtable GridRespData = (Hashtable)GridResp.Value; 150 Hashtable GridRespData = (Hashtable)GridResp.Value;
151 Hashtable griddatahash = GridRespData; 151 Hashtable griddatahash = GridRespData;
152 152
@@ -154,9 +154,9 @@ namespace OpenSim.Region.Communications.OGS1
154 if (GridRespData.ContainsKey("error")) 154 if (GridRespData.ContainsKey("error"))
155 { 155 {
156 string errorstring = (string) GridRespData["error"]; 156 string errorstring = (string) GridRespData["error"];
157 157
158 Exception e = new Exception(String.Format("Unable to connect to grid at {0}: {1}", serversInfo.GridURL, errorstring)); 158 Exception e = new Exception(String.Format("Unable to connect to grid at {0}: {1}", serversInfo.GridURL, errorstring));
159 159
160 throw e; 160 throw e;
161 } 161 }
162 else 162 else
@@ -170,9 +170,9 @@ namespace OpenSim.Region.Communications.OGS1
170 m_queuedGridSettings.Add("allow_forceful_banlines", "FALSE"); 170 m_queuedGridSettings.Add("allow_forceful_banlines", "FALSE");
171 } 171 }
172 } 172 }
173 173
174 m_log.InfoFormat( 174 m_log.InfoFormat(
175 "[OGS1 GRID SERVICES]: Region {0} successfully registered with grid at {1}", 175 "[OGS1 GRID SERVICES]: Region {0} successfully registered with grid at {1}",
176 regionInfo.RegionName, serversInfo.GridURL); 176 regionInfo.RegionName, serversInfo.GridURL);
177 } 177 }
178 return m_localBackend.RegisterRegion(regionInfo); 178 return m_localBackend.RegisterRegion(regionInfo);
@@ -245,7 +245,7 @@ namespace OpenSim.Region.Communications.OGS1
245 245
246 string externalIpStr = String.Empty; 246 string externalIpStr = String.Empty;
247 try 247 try
248 { 248 {
249 externalIpStr = Util.GetHostFromDNS(simIp).ToString(); 249 externalIpStr = Util.GetHostFromDNS(simIp).ToString();
250 } 250 }
251 catch (SocketException e) 251 catch (SocketException e)
@@ -253,16 +253,16 @@ namespace OpenSim.Region.Communications.OGS1
253 m_log.WarnFormat("RequestNeighbours(): Lookup of neighbour {0} failed! Not including in neighbours list. {1}", simIp, e); 253 m_log.WarnFormat("RequestNeighbours(): Lookup of neighbour {0} failed! Not including in neighbours list. {1}", simIp, e);
254 continue; 254 continue;
255 } 255 }
256 256
257 SimpleRegionInfo sri = new SimpleRegionInfo(regX, regY, simIp, port); 257 SimpleRegionInfo sri = new SimpleRegionInfo(regX, regY, simIp, port);
258 258
259 sri.RemotingPort = Convert.ToUInt32(neighbourData["remoting_port"]); 259 sri.RemotingPort = Convert.ToUInt32(neighbourData["remoting_port"]);
260 260
261 if (neighbourData.ContainsKey("http_port")) 261 if (neighbourData.ContainsKey("http_port"))
262 { 262 {
263 sri.HttpPort = Convert.ToUInt32(neighbourData["http_port"]); 263 sri.HttpPort = Convert.ToUInt32(neighbourData["http_port"]);
264 } 264 }
265 265
266 sri.RegionID = new LLUUID((string) neighbourData["uuid"]); 266 sri.RegionID = new LLUUID((string) neighbourData["uuid"]);
267 267
268 neighbours.Add(sri); 268 neighbours.Add(sri);
@@ -274,7 +274,7 @@ namespace OpenSim.Region.Communications.OGS1
274 } 274 }
275 275
276 /// <summary> 276 /// <summary>
277 /// 277 ///
278 /// </summary> 278 /// </summary>
279 /// <param name="regionHandle"></param> 279 /// <param name="regionHandle"></param>
280 /// <returns></returns> 280 /// <returns></returns>
@@ -309,7 +309,7 @@ namespace OpenSim.Region.Communications.OGS1
309 309
310 regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); 310 regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]);
311 regionInfo.RemotingAddress = internalIpStr; 311 regionInfo.RemotingAddress = internalIpStr;
312 312
313 if (responseData.ContainsKey("http_port")) 313 if (responseData.ContainsKey("http_port"))
314 { 314 {
315 regionInfo.HttpPort = Convert.ToUInt32((string) responseData["http_port"]); 315 regionInfo.HttpPort = Convert.ToUInt32((string) responseData["http_port"]);
@@ -327,7 +327,7 @@ namespace OpenSim.Region.Communications.OGS1
327 } 327 }
328 328
329 /// <summary> 329 /// <summary>
330 /// 330 ///
331 /// </summary> 331 /// </summary>
332 /// <param name="regionHandle"></param> 332 /// <param name="regionHandle"></param>
333 /// <returns></returns> 333 /// <returns></returns>
@@ -372,7 +372,7 @@ namespace OpenSim.Region.Communications.OGS1
372 372
373 regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); 373 regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]);
374 regionInfo.RemotingAddress = internalIpStr; 374 regionInfo.RemotingAddress = internalIpStr;
375 375
376 if (responseData.ContainsKey("http_port")) 376 if (responseData.ContainsKey("http_port"))
377 { 377 {
378 regionInfo.HttpPort = Convert.ToUInt32((string) responseData["http_port"]); 378 regionInfo.HttpPort = Convert.ToUInt32((string) responseData["http_port"]);
@@ -429,7 +429,7 @@ namespace OpenSim.Region.Communications.OGS1
429 429
430 regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); 430 regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]);
431 regionInfo.RemotingAddress = internalIpStr; 431 regionInfo.RemotingAddress = internalIpStr;
432 432
433 if (responseData.ContainsKey("http_port")) 433 if (responseData.ContainsKey("http_port"))
434 { 434 {
435 regionInfo.HttpPort = Convert.ToUInt32((string) responseData["http_port"]); 435 regionInfo.HttpPort = Convert.ToUInt32((string) responseData["http_port"]);
@@ -451,7 +451,7 @@ namespace OpenSim.Region.Communications.OGS1
451 } 451 }
452 452
453 /// <summary> 453 /// <summary>
454 /// 454 ///
455 /// </summary> 455 /// </summary>
456 /// <param name="minX"></param> 456 /// <param name="minX"></param>
457 /// <param name="minY"></param> 457 /// <param name="minY"></param>
@@ -601,7 +601,7 @@ namespace OpenSim.Region.Communications.OGS1
601 #region m_interRegion Comms 601 #region m_interRegion Comms
602 602
603 /// <summary> 603 /// <summary>
604 /// 604 ///
605 /// </summary> 605 /// </summary>
606 private void StartRemoting() 606 private void StartRemoting()
607 { 607 {
@@ -688,55 +688,55 @@ namespace OpenSim.Region.Communications.OGS1
688 catch (RemotingException e) 688 catch (RemotingException e)
689 { 689 {
690 NoteDeadRegion(regionHandle); 690 NoteDeadRegion(regionHandle);
691 691
692 m_log.WarnFormat( 692 m_log.WarnFormat(
693 "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", 693 "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
694 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); 694 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
695 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); 695 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
696 696
697 return false; 697 return false;
698 } 698 }
699 catch (SocketException e) 699 catch (SocketException e)
700 { 700 {
701 NoteDeadRegion(regionHandle); 701 NoteDeadRegion(regionHandle);
702 702
703 m_log.WarnFormat( 703 m_log.WarnFormat(
704 "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", 704 "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
705 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); 705 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
706 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); 706 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
707 707
708 return false; 708 return false;
709 } 709 }
710 catch (InvalidCredentialException e) 710 catch (InvalidCredentialException e)
711 { 711 {
712 NoteDeadRegion(regionHandle); 712 NoteDeadRegion(regionHandle);
713 713
714 m_log.WarnFormat( 714 m_log.WarnFormat(
715 "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", 715 "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
716 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); 716 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
717 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); 717 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
718 718
719 return false; 719 return false;
720 } 720 }
721 catch (AuthenticationException e) 721 catch (AuthenticationException e)
722 { 722 {
723 NoteDeadRegion(regionHandle); 723 NoteDeadRegion(regionHandle);
724 724
725 m_log.WarnFormat( 725 m_log.WarnFormat(
726 "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", 726 "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
727 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); 727 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
728 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); 728 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
729 729
730 return false; 730 return false;
731 } 731 }
732 catch (Exception e) 732 catch (Exception e)
733 { 733 {
734 NoteDeadRegion(regionHandle); 734 NoteDeadRegion(regionHandle);
735 735
736 m_log.WarnFormat("[OGS1 GRID SERVICES]: Unable to connect to adjacent region: {0} {1},{2}", 736 m_log.WarnFormat("[OGS1 GRID SERVICES]: Unable to connect to adjacent region: {0} {1},{2}",
737 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); 737 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
738 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); 738 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
739 739
740 return false; 740 return false;
741 } 741 }
742 } 742 }
@@ -748,7 +748,7 @@ namespace OpenSim.Region.Communications.OGS1
748 } 748 }
749 749
750 /// <summary> 750 /// <summary>
751 /// 751 ///
752 /// </summary> 752 /// </summary>
753 /// <param name="regionHandle"></param> 753 /// <param name="regionHandle"></param>
754 /// <param name="agentData"></param> 754 /// <param name="agentData"></param>
@@ -797,56 +797,56 @@ namespace OpenSim.Region.Communications.OGS1
797 catch (RemotingException e) 797 catch (RemotingException e)
798 { 798 {
799 NoteDeadRegion(regionHandle); 799 NoteDeadRegion(regionHandle);
800 800
801 m_log.WarnFormat( 801 m_log.WarnFormat(
802 "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", 802 "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
803 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); 803 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
804 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); 804 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
805 805
806 return false; 806 return false;
807 } 807 }
808 catch (SocketException e) 808 catch (SocketException e)
809 { 809 {
810 NoteDeadRegion(regionHandle); 810 NoteDeadRegion(regionHandle);
811 811
812 m_log.WarnFormat( 812 m_log.WarnFormat(
813 "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", 813 "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
814 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); 814 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
815 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); 815 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
816 816
817 return false; 817 return false;
818 } 818 }
819 catch (InvalidCredentialException e) 819 catch (InvalidCredentialException e)
820 { 820 {
821 NoteDeadRegion(regionHandle); 821 NoteDeadRegion(regionHandle);
822 822
823 m_log.WarnFormat( 823 m_log.WarnFormat(
824 "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", 824 "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
825 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); 825 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
826 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); 826 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
827 827
828 return false; 828 return false;
829 } 829 }
830 catch (AuthenticationException e) 830 catch (AuthenticationException e)
831 { 831 {
832 NoteDeadRegion(regionHandle); 832 NoteDeadRegion(regionHandle);
833 833
834 m_log.WarnFormat( 834 m_log.WarnFormat(
835 "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", 835 "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
836 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); 836 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
837 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); 837 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
838 838
839 return false; 839 return false;
840 } 840 }
841 catch (Exception e) 841 catch (Exception e)
842 { 842 {
843 NoteDeadRegion(regionHandle); 843 NoteDeadRegion(regionHandle);
844 844
845 m_log.WarnFormat( 845 m_log.WarnFormat(
846 "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", 846 "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
847 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); 847 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
848 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); 848 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
849 849
850 return false; 850 return false;
851 } 851 }
852 } 852 }
@@ -857,17 +857,17 @@ namespace OpenSim.Region.Communications.OGS1
857 SerializableRegionInfo regInfo = null; 857 SerializableRegionInfo regInfo = null;
858 try 858 try
859 { 859 {
860 // You may ask why this is in here... 860 // You may ask why this is in here...
861 // The region asking the grid services about itself.. 861 // The region asking the grid services about itself..
862 // And, surprisingly, the reason is.. it doesn't know 862 // And, surprisingly, the reason is.. it doesn't know
863 // it's own remoting port! How special. 863 // it's own remoting port! How special.
864 RegionUpData regiondata = new RegionUpData(region.RegionLocX, region.RegionLocY, region.ExternalHostName, region.InternalEndPoint.Port); 864 RegionUpData regiondata = new RegionUpData(region.RegionLocX, region.RegionLocY, region.ExternalHostName, region.InternalEndPoint.Port);
865 865
866 region = new SerializableRegionInfo(RequestNeighbourInfo(region.RegionHandle)); 866 region = new SerializableRegionInfo(RequestNeighbourInfo(region.RegionHandle));
867 region.RemotingAddress = region.ExternalHostName; 867 region.RemotingAddress = region.ExternalHostName;
868 region.RemotingPort = NetworkServersInfo.RemotingListenerPort; 868 region.RemotingPort = NetworkServersInfo.RemotingListenerPort;
869 region.HttpPort = serversInfo.HttpListenerPort; 869 region.HttpPort = serversInfo.HttpListenerPort;
870 870
871 if (m_localBackend.RegionUp(region, regionhandle)) 871 if (m_localBackend.RegionUp(region, regionhandle))
872 { 872 {
873 return true; 873 return true;
@@ -904,7 +904,7 @@ namespace OpenSim.Region.Communications.OGS1
904 } 904 }
905 else 905 else
906 { 906 {
907 // We're trying to inform ourselves via remoting. 907 // We're trying to inform ourselves via remoting.
908 // This is here because we're looping over the listeners before we get here. 908 // This is here because we're looping over the listeners before we get here.
909 // Odd but it should work. 909 // Odd but it should work.
910 return true; 910 return true;
@@ -963,7 +963,7 @@ namespace OpenSim.Region.Communications.OGS1
963 } 963 }
964 964
965 /// <summary> 965 /// <summary>
966 /// 966 ///
967 /// </summary> 967 /// </summary>
968 /// <param name="regionHandle"></param> 968 /// <param name="regionHandle"></param>
969 /// <param name="agentData"></param> 969 /// <param name="agentData"></param>
@@ -1058,7 +1058,7 @@ namespace OpenSim.Region.Communications.OGS1
1058 } 1058 }
1059 1059
1060 /// <summary> 1060 /// <summary>
1061 /// 1061 ///
1062 /// </summary> 1062 /// </summary>
1063 /// <param name="regionHandle"></param> 1063 /// <param name="regionHandle"></param>
1064 /// <param name="agentID"></param> 1064 /// <param name="agentID"></param>
@@ -1098,20 +1098,20 @@ namespace OpenSim.Region.Communications.OGS1
1098 1098
1099 return retValue; 1099 return retValue;
1100 } 1100 }
1101 //TODO need to see if we know about where this region is and use .net remoting 1101 //TODO need to see if we know about where this region is and use .net remoting
1102 // to inform it. 1102 // to inform it.
1103 NoteDeadRegion(regionHandle); 1103 NoteDeadRegion(regionHandle);
1104 return false; 1104 return false;
1105 } 1105 }
1106 catch (RemotingException e) 1106 catch (RemotingException e)
1107 { 1107 {
1108 NoteDeadRegion(regionHandle); 1108 NoteDeadRegion(regionHandle);
1109 1109
1110 m_log.WarnFormat( 1110 m_log.WarnFormat(
1111 "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", 1111 "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
1112 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); 1112 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
1113 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); 1113 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
1114 1114
1115 return false; 1115 return false;
1116 } 1116 }
1117 catch 1117 catch
@@ -1155,8 +1155,8 @@ namespace OpenSim.Region.Communications.OGS1
1155 1155
1156 return retValue; 1156 return retValue;
1157 } 1157 }
1158 //TODO need to see if we know about where this region is and use .net remoting 1158 //TODO need to see if we know about where this region is and use .net remoting
1159 // to inform it. 1159 // to inform it.
1160 NoteDeadRegion(regionHandle); 1160 NoteDeadRegion(regionHandle);
1161 return false; 1161 return false;
1162 } 1162 }
@@ -1184,7 +1184,7 @@ namespace OpenSim.Region.Communications.OGS1
1184 catch (AuthenticationException e) 1184 catch (AuthenticationException e)
1185 { 1185 {
1186 NoteDeadRegion(regionHandle); 1186 NoteDeadRegion(regionHandle);
1187 m_log.Warn("[OGS1 GRID SERVICES]: Authentication exception: Unable to connect to adjacent region: " + regionHandle); 1187 m_log.Warn("[OGS1 GRID SERVICES]: Authentication exception: Unable to connect to adjacent region: " + regionHandle);
1188 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); 1188 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
1189 return false; 1189 return false;
1190 } 1190 }
@@ -1230,8 +1230,8 @@ namespace OpenSim.Region.Communications.OGS1
1230 1230
1231 return true; 1231 return true;
1232 } 1232 }
1233 //TODO need to see if we know about where this region is and use .net remoting 1233 //TODO need to see if we know about where this region is and use .net remoting
1234 // to inform it. 1234 // to inform it.
1235 NoteDeadRegion(regionHandle); 1235 NoteDeadRegion(regionHandle);
1236 return false; 1236 return false;
1237 } 1237 }
@@ -1311,7 +1311,7 @@ namespace OpenSim.Region.Communications.OGS1
1311 #region Methods triggered by calls from external instances 1311 #region Methods triggered by calls from external instances
1312 1312
1313 /// <summary> 1313 /// <summary>
1314 /// 1314 ///
1315 /// </summary> 1315 /// </summary>
1316 /// <param name="regionHandle"></param> 1316 /// <param name="regionHandle"></param>
1317 /// <param name="agentData"></param> 1317 /// <param name="agentData"></param>
@@ -1342,7 +1342,7 @@ namespace OpenSim.Region.Communications.OGS1
1342 nRegionInfo.RegionLocX = regionData.X; 1342 nRegionInfo.RegionLocX = regionData.X;
1343 nRegionInfo.RegionLocY = regionData.Y; 1343 nRegionInfo.RegionLocY = regionData.Y;
1344 1344
1345 1345
1346 try 1346 try
1347 { 1347 {
1348 lock (m_deadRegionCache) 1348 lock (m_deadRegionCache)
@@ -1379,14 +1379,14 @@ namespace OpenSim.Region.Communications.OGS1
1379 } 1379 }
1380 1380
1381 /// <summary> 1381 /// <summary>
1382 /// 1382 ///
1383 /// </summary> 1383 /// </summary>
1384 /// <param name="regionHandle"></param> 1384 /// <param name="regionHandle"></param>
1385 /// <param name="agentData"></param> 1385 /// <param name="agentData"></param>
1386 /// <returns></returns> 1386 /// <returns></returns>
1387 public bool IncomingPrim(ulong regionHandle, LLUUID primID, string objData, int XMLMethod) 1387 public bool IncomingPrim(ulong regionHandle, LLUUID primID, string objData, int XMLMethod)
1388 { 1388 {
1389 // Is this necessary? 1389 // Is this necessary?
1390 try 1390 try
1391 { 1391 {
1392 m_localBackend.TriggerExpectPrim(regionHandle, primID, objData, XMLMethod); 1392 m_localBackend.TriggerExpectPrim(regionHandle, primID, objData, XMLMethod);
@@ -1401,7 +1401,7 @@ namespace OpenSim.Region.Communications.OGS1
1401 } 1401 }
1402 1402
1403 /// <summary> 1403 /// <summary>
1404 /// 1404 ///
1405 /// </summary> 1405 /// </summary>
1406 /// <param name="regionHandle"></param> 1406 /// <param name="regionHandle"></param>
1407 /// <param name="agentID"></param> 1407 /// <param name="agentID"></param>
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 0f75a09..9b3d878 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -41,11 +41,11 @@ namespace OpenSim.Region.Communications.OGS1
41{ 41{
42 public class OGS1InventoryService : IInventoryServices 42 public class OGS1InventoryService : IInventoryServices
43 { 43 {
44 private static readonly ILog m_log 44 private static readonly ILog m_log
45 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 46
47 private string _inventoryServerUrl; 47 private string _inventoryServerUrl;
48 private Dictionary<LLUUID, InventoryReceiptCallback> m_RequestingInventory 48 private Dictionary<LLUUID, InventoryReceiptCallback> m_RequestingInventory
49 = new Dictionary<LLUUID, InventoryReceiptCallback>(); 49 = new Dictionary<LLUUID, InventoryReceiptCallback>();
50 50
51 public OGS1InventoryService(string inventoryServerUrl) 51 public OGS1InventoryService(string inventoryServerUrl)
@@ -65,26 +65,26 @@ namespace OpenSim.Region.Communications.OGS1
65 if (!m_RequestingInventory.ContainsKey(userID)) 65 if (!m_RequestingInventory.ContainsKey(userID))
66 { 66 {
67 m_RequestingInventory.Add(userID, callback); 67 m_RequestingInventory.Add(userID, callback);
68 68
69 try 69 try
70 { 70 {
71 m_log.InfoFormat( 71 m_log.InfoFormat(
72 "[OGS1 INVENTORY SERVICE]: Requesting inventory from {0}/GetInventory/ for user {1}", 72 "[OGS1 INVENTORY SERVICE]: Requesting inventory from {0}/GetInventory/ for user {1}",
73 _inventoryServerUrl, userID); 73 _inventoryServerUrl, userID);
74 74
75 RestObjectPosterResponse<InventoryCollection> requester 75 RestObjectPosterResponse<InventoryCollection> requester
76 = new RestObjectPosterResponse<InventoryCollection>(); 76 = new RestObjectPosterResponse<InventoryCollection>();
77 requester.ResponseCallback = InventoryResponse; 77 requester.ResponseCallback = InventoryResponse;
78 78
79 requester.BeginPostObject<Guid>(_inventoryServerUrl + "/GetInventory/", userID.UUID); 79 requester.BeginPostObject<Guid>(_inventoryServerUrl + "/GetInventory/", userID.UUID);
80 } 80 }
81 catch (WebException e) 81 catch (WebException e)
82 { 82 {
83 if (StatsManager.SimExtraStats != null) 83 if (StatsManager.SimExtraStats != null)
84 StatsManager.SimExtraStats.AddInventoryServiceRetrievalFailure(); 84 StatsManager.SimExtraStats.AddInventoryServiceRetrievalFailure();
85 85
86 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Request inventory operation failed, {0} {1}", 86 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Request inventory operation failed, {0} {1}",
87 e.Source, e.Message); 87 e.Source, e.Message);
88 } 88 }
89 } 89 }
90 else 90 else
@@ -92,11 +92,11 @@ namespace OpenSim.Region.Communications.OGS1
92 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: RequestInventoryForUser() - could you not find user profile for {0}", userID); 92 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: RequestInventoryForUser() - could you not find user profile for {0}", userID);
93 } 93 }
94 } 94 }
95 95
96 /// <summary> 96 /// <summary>
97 /// Callback used by the inventory server GetInventory request 97 /// Callback used by the inventory server GetInventory request
98 /// </summary> 98 /// </summary>
99 /// <param name="userID"></param> 99 /// <param name="userID"></param>
100 private void InventoryResponse(InventoryCollection response) 100 private void InventoryResponse(InventoryCollection response)
101 { 101 {
102 LLUUID userID = response.UserID; 102 LLUUID userID = response.UserID;
@@ -108,17 +108,17 @@ namespace OpenSim.Region.Communications.OGS1
108 108
109 InventoryFolderImpl rootFolder = null; 109 InventoryFolderImpl rootFolder = null;
110 InventoryReceiptCallback callback = m_RequestingInventory[userID]; 110 InventoryReceiptCallback callback = m_RequestingInventory[userID];
111 111
112 ICollection<InventoryFolderImpl> folders = new List<InventoryFolderImpl>(); 112 ICollection<InventoryFolderImpl> folders = new List<InventoryFolderImpl>();
113 ICollection<InventoryItemBase> items = new List<InventoryItemBase>(); 113 ICollection<InventoryItemBase> items = new List<InventoryItemBase>();
114 114
115 foreach (InventoryFolderBase folder in response.Folders) 115 foreach (InventoryFolderBase folder in response.Folders)
116 { 116 {
117 if (folder.ParentID == LLUUID.Zero) 117 if (folder.ParentID == LLUUID.Zero)
118 { 118 {
119 rootFolder = new InventoryFolderImpl(folder); 119 rootFolder = new InventoryFolderImpl(folder);
120 folders.Add(rootFolder); 120 folders.Add(rootFolder);
121 121
122 break; 122 break;
123 } 123 }
124 } 124 }
@@ -142,9 +142,9 @@ namespace OpenSim.Region.Communications.OGS1
142 { 142 {
143 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Did not get back an inventory containing a root folder for user {0}", userID); 143 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Did not get back an inventory containing a root folder for user {0}", userID);
144 } 144 }
145 145
146 callback(folders, items); 146 callback(folders, items);
147 147
148 m_RequestingInventory.Remove(userID); 148 m_RequestingInventory.Remove(userID);
149 } 149 }
150 else 150 else
@@ -158,7 +158,7 @@ namespace OpenSim.Region.Communications.OGS1
158 158
159 /// <summary> 159 /// <summary>
160 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see> 160 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
161 /// </summary> 161 /// </summary>
162 public bool AddFolder(InventoryFolderBase folder) 162 public bool AddFolder(InventoryFolderBase folder)
163 { 163 {
164 try 164 try
@@ -168,68 +168,68 @@ namespace OpenSim.Region.Communications.OGS1
168 } 168 }
169 catch (WebException e) 169 catch (WebException e)
170 { 170 {
171 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory folder operation failed, {0} {1}", 171 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory folder operation failed, {0} {1}",
172 e.Source, e.Message); 172 e.Source, e.Message);
173 } 173 }
174 174
175 return false; 175 return false;
176 } 176 }
177 177
178 /// <summary> 178 /// <summary>
179 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see> 179 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
180 /// </summary> 180 /// </summary>
181 /// <param name="folder"></param> 181 /// <param name="folder"></param>
182 public bool MoveFolder(InventoryFolderBase folder) 182 public bool MoveFolder(InventoryFolderBase folder)
183 { 183 {
184 try 184 try
185 { 185 {
186 return SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>( 186 return SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>(
187 "POST", _inventoryServerUrl + "/MoveFolder/", folder); 187 "POST", _inventoryServerUrl + "/MoveFolder/", folder);
188 } 188 }
189 catch (WebException e) 189 catch (WebException e)
190 { 190 {
191 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Move inventory folder operation failed, {0} {1}", 191 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Move inventory folder operation failed, {0} {1}",
192 e.Source, e.Message); 192 e.Source, e.Message);
193 } 193 }
194 194
195 return false; 195 return false;
196 } 196 }
197 197
198 /// <summary> 198 /// <summary>
199 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see> 199 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
200 /// </summary> 200 /// </summary>
201 public bool PurgeFolder(InventoryFolderBase folder) 201 public bool PurgeFolder(InventoryFolderBase folder)
202 { 202 {
203 try 203 try
204 { 204 {
205 return SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>( 205 return SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>(
206 "POST", _inventoryServerUrl + "/PurgeFolder/", folder); 206 "POST", _inventoryServerUrl + "/PurgeFolder/", folder);
207 } 207 }
208 catch (WebException e) 208 catch (WebException e)
209 { 209 {
210 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Move inventory folder operation failed, {0} {1}", 210 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Move inventory folder operation failed, {0} {1}",
211 e.Source, e.Message); 211 e.Source, e.Message);
212 } 212 }
213 213
214 return false; 214 return false;
215 } 215 }
216 216
217 /// <summary> 217 /// <summary>
218 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see> 218 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
219 /// </summary> 219 /// </summary>
220 public bool AddItem(InventoryItemBase item) 220 public bool AddItem(InventoryItemBase item)
221 { 221 {
222 try 222 try
223 { 223 {
224 return SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>( 224 return SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>(
225 "POST", _inventoryServerUrl + "/NewItem/", item); 225 "POST", _inventoryServerUrl + "/NewItem/", item);
226 } 226 }
227 catch (WebException e) 227 catch (WebException e)
228 { 228 {
229 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory item operation failed, {0} {1}", 229 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory item operation failed, {0} {1}",
230 e.Source, e.Message); 230 e.Source, e.Message);
231 } 231 }
232 232
233 return false; 233 return false;
234 } 234 }
235 235
@@ -246,26 +246,26 @@ namespace OpenSim.Region.Communications.OGS1
246 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Update new inventory item operation failed, {0} {1}", 246 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Update new inventory item operation failed, {0} {1}",
247 e.Source, e.Message); 247 e.Source, e.Message);
248 } 248 }
249 249
250 return false; 250 return false;
251 } 251 }
252 252
253 /// <summary> 253 /// <summary>
254 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see> 254 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
255 /// </summary> 255 /// </summary>
256 public bool DeleteItem(InventoryItemBase item) 256 public bool DeleteItem(InventoryItemBase item)
257 { 257 {
258 try 258 try
259 { 259 {
260 return SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>( 260 return SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>(
261 "POST", _inventoryServerUrl + "/DeleteItem/", item); 261 "POST", _inventoryServerUrl + "/DeleteItem/", item);
262 } 262 }
263 catch (WebException e) 263 catch (WebException e)
264 { 264 {
265 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Delete inventory item operation failed, {0} {1}", 265 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Delete inventory item operation failed, {0} {1}",
266 e.Source, e.Message); 266 e.Source, e.Message);
267 } 267 }
268 268
269 return false; 269 return false;
270 } 270 }
271 271
@@ -283,12 +283,12 @@ namespace OpenSim.Region.Communications.OGS1
283 { 283 {
284 return false; 284 return false;
285 } 285 }
286 286
287 // See IInventoryServices 287 // See IInventoryServices
288 public List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId) 288 public List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId)
289 { 289 {
290 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: The GetInventorySkeleton() method here should never be called!"); 290 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: The GetInventorySkeleton() method here should never be called!");
291 291
292 return new List<InventoryFolderBase>(); 292 return new List<InventoryFolderBase>();
293 } 293 }
294 294
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index e3ee2c1..63fad4a 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -117,8 +117,8 @@ namespace OpenSim.Region.Communications.OGS1
117 { 117 {
118 List<FriendListItem> buddylist = new List<FriendListItem>(); 118 List<FriendListItem> buddylist = new List<FriendListItem>();
119 int buddycount = Convert.ToInt32((string)data["avcount"]); 119 int buddycount = Convert.ToInt32((string)data["avcount"]);
120 120
121 121
122 for (int i = 0; i < buddycount; i++) 122 for (int i = 0; i < buddycount; i++)
123 { 123 {
124 FriendListItem buddylistitem = new FriendListItem(); 124 FriendListItem buddylistitem = new FriendListItem();
@@ -130,8 +130,8 @@ namespace OpenSim.Region.Communications.OGS1
130 130
131 buddylist.Add(buddylistitem); 131 buddylist.Add(buddylistitem);
132 } 132 }
133 133
134 134
135 return buddylist; 135 return buddylist;
136 } 136 }
137 137
@@ -201,7 +201,7 @@ namespace OpenSim.Region.Communications.OGS1
201 /// Get a user profile from the user server 201 /// Get a user profile from the user server
202 /// </summary> 202 /// </summary>
203 /// <param name="avatarID"></param> 203 /// <param name="avatarID"></param>
204 /// <returns>null if the request fails</returns> 204 /// <returns>null if the request fails</returns>
205 public UserProfileData GetUserProfile(string name) 205 public UserProfileData GetUserProfile(string name)
206 { 206 {
207 try 207 try
@@ -222,7 +222,7 @@ namespace OpenSim.Region.Communications.OGS1
222 "[OGS1 USER SERVICES]: Error when trying to fetch profile data by name from remote user server: {0}", 222 "[OGS1 USER SERVICES]: Error when trying to fetch profile data by name from remote user server: {0}",
223 e); 223 e);
224 } 224 }
225 225
226 return null; 226 return null;
227 } 227 }
228 228
@@ -251,7 +251,7 @@ namespace OpenSim.Region.Communications.OGS1
251 "[OGS1 USER SERVICES]: Error when trying to fetch profile data by uuid from remote user server: {0}", 251 "[OGS1 USER SERVICES]: Error when trying to fetch profile data by uuid from remote user server: {0}",
252 e); 252 e);
253 } 253 }
254 254
255 return null; 255 return null;
256 } 256 }
257 257
@@ -264,7 +264,7 @@ namespace OpenSim.Region.Communications.OGS1
264 /// Retrieve the user information for the given master uuid. 264 /// Retrieve the user information for the given master uuid.
265 /// </summary> 265 /// </summary>
266 /// <param name="uuid"></param> 266 /// <param name="uuid"></param>
267 /// <returns></returns> 267 /// <returns></returns>
268 public UserProfileData SetupMasterUser(string firstName, string lastName) 268 public UserProfileData SetupMasterUser(string firstName, string lastName)
269 { 269 {
270 return SetupMasterUser(firstName, lastName, String.Empty); 270 return SetupMasterUser(firstName, lastName, String.Empty);
@@ -274,7 +274,7 @@ namespace OpenSim.Region.Communications.OGS1
274 /// Retrieve the user information for the given master uuid. 274 /// Retrieve the user information for the given master uuid.
275 /// </summary> 275 /// </summary>
276 /// <param name="uuid"></param> 276 /// <param name="uuid"></param>
277 /// <returns></returns> 277 /// <returns></returns>
278 public UserProfileData SetupMasterUser(string firstName, string lastName, string password) 278 public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
279 { 279 {
280 UserProfileData profile = GetUserProfile(firstName, lastName); 280 UserProfileData profile = GetUserProfile(firstName, lastName);
@@ -289,13 +289,13 @@ namespace OpenSim.Region.Communications.OGS1
289 public UserProfileData SetupMasterUser(LLUUID uuid) 289 public UserProfileData SetupMasterUser(LLUUID uuid)
290 { 290 {
291 UserProfileData data = GetUserProfile(uuid); 291 UserProfileData data = GetUserProfile(uuid);
292 292
293 if (data == null) 293 if (data == null)
294 { 294 {
295 throw new Exception( 295 throw new Exception(
296 "Could not retrieve profile for master user " + uuid + ". User server did not respond to the request."); 296 "Could not retrieve profile for master user " + uuid + ". User server did not respond to the request.");
297 } 297 }
298 298
299 return data; 299 return data;
300 } 300 }
301 301
@@ -405,9 +405,9 @@ namespace OpenSim.Region.Communications.OGS1
405 { 405 {
406 m_log.Warn("[GRID]: Error when trying to AddNewUserFriend: " + 406 m_log.Warn("[GRID]: Error when trying to AddNewUserFriend: " +
407 e.Message); 407 e.Message);
408 408
409 } 409 }
410 410
411 } 411 }
412 412
413 /// <summary> 413 /// <summary>
@@ -422,7 +422,7 @@ namespace OpenSim.Region.Communications.OGS1
422 Hashtable param = new Hashtable(); 422 Hashtable param = new Hashtable();
423 param["ownerID"] = friendlistowner.UUID.ToString(); 423 param["ownerID"] = friendlistowner.UUID.ToString();
424 param["friendID"] = friend.UUID.ToString(); 424 param["friendID"] = friend.UUID.ToString();
425 425
426 426
427 IList parameters = new ArrayList(); 427 IList parameters = new ArrayList();
428 parameters.Add(param); 428 parameters.Add(param);
@@ -458,7 +458,7 @@ namespace OpenSim.Region.Communications.OGS1
458 { 458 {
459 m_log.Warn("[GRID]: Error when trying to RemoveUserFriend: " + 459 m_log.Warn("[GRID]: Error when trying to RemoveUserFriend: " +
460 e.Message); 460 e.Message);
461 461
462 } 462 }
463 } 463 }
464 464
@@ -519,7 +519,7 @@ namespace OpenSim.Region.Communications.OGS1
519 public List<FriendListItem> GetUserFriendList(LLUUID friendlistowner) 519 public List<FriendListItem> GetUserFriendList(LLUUID friendlistowner)
520 { 520 {
521 List<FriendListItem> buddylist = new List<FriendListItem>(); 521 List<FriendListItem> buddylist = new List<FriendListItem>();
522 522
523 try 523 try
524 { 524 {
525 Hashtable param = new Hashtable(); 525 Hashtable param = new Hashtable();
@@ -531,11 +531,11 @@ namespace OpenSim.Region.Communications.OGS1
531 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 8000); 531 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 8000);
532 Hashtable respData = (Hashtable) resp.Value; 532 Hashtable respData = (Hashtable) resp.Value;
533 533
534 if (respData.Contains("avcount")) 534 if (respData.Contains("avcount"))
535 { 535 {
536 buddylist = ConvertXMLRPCDataToFriendListItemList(respData); 536 buddylist = ConvertXMLRPCDataToFriendListItemList(respData);
537 } 537 }
538 538
539 } 539 }
540 catch (WebException e) 540 catch (WebException e)
541 { 541 {
@@ -550,7 +550,7 @@ namespace OpenSim.Region.Communications.OGS1
550 550
551 /// Appearance 551 /// Appearance
552 /// TODO: stubs for now to get us to a compiling state gently 552 /// TODO: stubs for now to get us to a compiling state gently
553 public AvatarAppearance GetUserAppearance(LLUUID user) 553 public AvatarAppearance GetUserAppearance(LLUUID user)
554 { 554 {
555 return new AvatarAppearance(); 555 return new AvatarAppearance();
556 } 556 }
@@ -564,12 +564,12 @@ namespace OpenSim.Region.Communications.OGS1
564 { 564 {
565 return; 565 return;
566 } 566 }
567 567
568 public void RemoveAttachment(LLUUID user, LLUUID item) 568 public void RemoveAttachment(LLUUID user, LLUUID item)
569 { 569 {
570 return; 570 return;
571 } 571 }
572 572
573 public List<LLUUID> GetAttachments(LLUUID user) 573 public List<LLUUID> GetAttachments(LLUUID user)
574 { 574 {
575 return new List<LLUUID>(); 575 return new List<LLUUID>();
diff --git a/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
index 964180a..c15c604 100644
--- a/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
@@ -28,7 +28,7 @@
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
30 30
31// General Information about an assembly is controlled through the following 31// General information about an assembly is controlled through the following
32// set of attributes. Change these attribute values to modify the information 32// set of attributes. Change these attribute values to modify the information
33// associated with an assembly. 33// associated with an assembly.
34 34
@@ -41,8 +41,8 @@ using System.Runtime.InteropServices;
41[assembly : AssemblyTrademark("")] 41[assembly : AssemblyTrademark("")]
42[assembly : AssemblyCulture("")] 42[assembly : AssemblyCulture("")]
43 43
44// Setting ComVisible to false makes the types in this assembly not visible 44// Setting ComVisible to false makes the types in this assembly not visible
45// to COM components. If you need to access a type in this assembly from 45// to COM components. If you need to access a type in this assembly from
46// COM, set the ComVisible attribute to true on that type. 46// COM, set the ComVisible attribute to true on that type.
47 47
48[assembly : ComVisible(false)] 48[assembly : ComVisible(false)]
@@ -54,11 +54,11 @@ using System.Runtime.InteropServices;
54// Version information for an assembly consists of the following four values: 54// Version information for an assembly consists of the following four values:
55// 55//
56// Major Version 56// Major Version
57// Minor Version 57// Minor Version
58// Build Number 58// Build Number
59// Revision 59// Revision
60// 60//
61// You can specify all the values or you can default the Revision and Build Numbers 61// You can specify all the values or you can default the Revision and Build Numbers
62// by using the '*' as shown below: 62// by using the '*' as shown below:
63 63
64[assembly : AssemblyVersion("1.0.0.0")] 64[assembly : AssemblyVersion("1.0.0.0")]