aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
authorJeff Ames2007-12-04 22:14:53 +0000
committerJeff Ames2007-12-04 22:14:53 +0000
commitf195725db447aad7595810a9950f656163bf1c13 (patch)
tree2d62dbd3635b008e9c41c2645fc71a6abbcc0a26 /OpenSim/Region/Communications
parentmade log messages for known unhandled packet types shorter and yellower. add... (diff)
downloadopensim-SC_OLD-f195725db447aad7595810a9950f656163bf1c13.zip
opensim-SC_OLD-f195725db447aad7595810a9950f656163bf1c13.tar.gz
opensim-SC_OLD-f195725db447aad7595810a9950f656163bf1c13.tar.bz2
opensim-SC_OLD-f195725db447aad7595810a9950f656163bf1c13.tar.xz
keeping opensim safe for children -- made some namespace references less explicit
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs23
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs10
2 files changed, 14 insertions, 19 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index 91b6c1f..9d390e4 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -29,6 +29,7 @@ using System.Collections;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using libsecondlife; 30using libsecondlife;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Framework.Console;
32using OpenSim.Framework.Communications; 33using OpenSim.Framework.Communications;
33 34
34namespace OpenSim.Region.Communications.Local 35namespace OpenSim.Region.Communications.Local
@@ -50,7 +51,6 @@ namespace OpenSim.Region.Communications.Local
50 set 51 set
51 { 52 {
52 _gdebugRegionName = value; 53 _gdebugRegionName = value;
53
54 } 54 }
55 } 55 }
56 public string _rdebugRegionName = ""; 56 public string _rdebugRegionName = "";
@@ -61,7 +61,6 @@ namespace OpenSim.Region.Communications.Local
61 set 61 set
62 { 62 {
63 _rdebugRegionName = value; 63 _rdebugRegionName = value;
64
65 } 64 }
66 } 65 }
67 public LocalBackEndServices() 66 public LocalBackEndServices()
@@ -84,7 +83,7 @@ namespace OpenSim.Region.Communications.Local
84 RegionCommsListener regionHost = new RegionCommsListener(); 83 RegionCommsListener regionHost = new RegionCommsListener();
85 if (m_regionListeners.ContainsKey(regionInfo.RegionHandle)) 84 if (m_regionListeners.ContainsKey(regionInfo.RegionHandle))
86 { 85 {
87 OpenSim.Framework.Console.MainLog.Instance.Error("INTERREGION", "Error:Region registered twice as an Events listener for Interregion Communications but not as a listed region. In Standalone mode this will cause BIG issues. In grid mode, it means a region went down and came back up."); 86 MainLog.Instance.Error("INTERREGION", "Error:Region registered twice as an Events listener for Interregion Communications but not as a listed region. In Standalone mode this will cause BIG issues. In grid mode, it means a region went down and came back up.");
88 m_regionListeners.Remove(regionInfo.RegionHandle); 87 m_regionListeners.Remove(regionInfo.RegionHandle);
89 } 88 }
90 m_regionListeners.Add(regionInfo.RegionHandle, regionHost); 89 m_regionListeners.Add(regionInfo.RegionHandle, regionHost);
@@ -95,7 +94,7 @@ namespace OpenSim.Region.Communications.Local
95 { 94 {
96 // Already in our list, so the region went dead and restarted. 95 // Already in our list, so the region went dead and restarted.
97 m_regions.Remove(regionInfo.RegionHandle); 96 m_regions.Remove(regionInfo.RegionHandle);
98 OpenSim.Framework.Console.MainLog.Instance.Warn("INTERREGION", "Region registered twice. Region went down and came back up."); 97 MainLog.Instance.Warn("INTERREGION", "Region registered twice. Region went down and came back up.");
99 98
100 RegionCommsListener regionHost = new RegionCommsListener(); 99 RegionCommsListener regionHost = new RegionCommsListener();
101 if (m_regionListeners.ContainsKey(regionInfo.RegionHandle)) 100 if (m_regionListeners.ContainsKey(regionInfo.RegionHandle))
@@ -208,7 +207,6 @@ namespace OpenSim.Region.Communications.Local
208 207
209 public bool TriggerRegionUp(RegionInfo region, ulong regionhandle) 208 public bool TriggerRegionUp(RegionInfo region, ulong regionhandle)
210 { 209 {
211
212 if (m_regionListeners.ContainsKey(regionhandle)) 210 if (m_regionListeners.ContainsKey(regionhandle))
213 { 211 {
214 return m_regionListeners[regionhandle].TriggerRegionUp(region); 212 return m_regionListeners[regionhandle].TriggerRegionUp(region);
@@ -227,13 +225,13 @@ namespace OpenSim.Region.Communications.Local
227 //should change from agentCircuitData 225 //should change from agentCircuitData
228 { 226 {
229 //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent"); 227 //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent");
230 //OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Trying to inform region of child agent: " + agentData.firstname + " " + agentData.lastname); 228 //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Trying to inform region of child agent: " + agentData.firstname + " " + agentData.lastname);
231 229
232 if (m_regionListeners.ContainsKey(regionHandle)) 230 if (m_regionListeners.ContainsKey(regionHandle))
233 { 231 {
234 // Console.WriteLine("CommsManager- Informing a region to expect child agent"); 232 // Console.WriteLine("CommsManager- Informing a region to expect child agent");
235 m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agentData); 233 m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agentData);
236 //OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Got Listener trigginering local event: " + agentData.firstname + " " + agentData.lastname); 234 //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Got Listener trigginering local event: " + agentData.firstname + " " + agentData.lastname);
237 235
238 return true; 236 return true;
239 } 237 }
@@ -327,11 +325,11 @@ namespace OpenSim.Region.Communications.Local
327 325
328 public void TriggerExpectUser(ulong regionHandle, AgentCircuitData agent) 326 public void TriggerExpectUser(ulong regionHandle, AgentCircuitData agent)
329 { 327 {
330 //OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Other region is sending child agent our way: " + agent.firstname + " " + agent.lastname); 328 //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Other region is sending child agent our way: " + agent.firstname + " " + agent.lastname);
331 329
332 if (m_regionListeners.ContainsKey(regionHandle)) 330 if (m_regionListeners.ContainsKey(regionHandle))
333 { 331 {
334 //OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: FoundLocalRegion To send it to: " + agent.firstname + " " + agent.lastname); 332 //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: FoundLocalRegion To send it to: " + agent.firstname + " " + agent.lastname);
335 333
336 m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agent); 334 m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agent);
337 } 335 }
@@ -343,7 +341,6 @@ namespace OpenSim.Region.Communications.Local
343 { 341 {
344 m_regionListeners[regionHandle].TriggerExpectPrim(regionHandle, primID, objData); 342 m_regionListeners[regionHandle].TriggerExpectPrim(regionHandle, primID, objData);
345 } 343 }
346
347 } 344 }
348 345
349 public void PingCheckReply(Hashtable respData) 346 public void PingCheckReply(Hashtable respData)
@@ -381,11 +378,11 @@ namespace OpenSim.Region.Communications.Local
381 378
382 public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData) 379 public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData)
383 { 380 {
384 // OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Other local region is sending child agent our way: " + agentData.firstname + " " + agentData.lastname); 381 // MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Other local region is sending child agent our way: " + agentData.firstname + " " + agentData.lastname);
385 382
386 if (m_regionListeners.ContainsKey(regionHandle)) 383 if (m_regionListeners.ContainsKey(regionHandle))
387 { 384 {
388 //OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: found local region to trigger event on: " + agentData.firstname + " " + agentData.lastname); 385 //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: found local region to trigger event on: " + agentData.firstname + " " + agentData.lastname);
389 386
390 TriggerExpectUser(regionHandle, agentData); 387 TriggerExpectUser(regionHandle, agentData);
391 return true; 388 return true;
@@ -394,4 +391,4 @@ namespace OpenSim.Region.Communications.Local
394 return false; 391 return false;
395 } 392 }
396 } 393 }
397} \ No newline at end of file 394}
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index ed77e20..d26da90 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -50,8 +50,8 @@ namespace OpenSim.Region.Communications.OGS1
50 { 50 {
51 if (data.Contains("error_type")) 51 if (data.Contains("error_type"))
52 { 52 {
53 OpenSim.Framework.Console.MainLog.Instance.Warn("GRID", "Error sent by user server when trying to get user profile: (" + data["error_type"] + 53 MainLog.Instance.Warn("GRID", "Error sent by user server when trying to get user profile: (" + data["error_type"] +
54 "): " + data["error_desc"]); 54 "): " + data["error_desc"]);
55 return null; 55 return null;
56 } 56 }
57 57
@@ -104,16 +104,13 @@ namespace OpenSim.Region.Communications.OGS1
104 MainLog.Instance.Warn("INTERGRID", "Got invalid queryID from userServer"); 104 MainLog.Instance.Warn("INTERGRID", "Got invalid queryID from userServer");
105 } 105 }
106 return pickerlist; 106 return pickerlist;
107
108 } 107 }
109 108
110
111 public UserProfileData GetUserProfile(string firstName, string lastName) 109 public UserProfileData GetUserProfile(string firstName, string lastName)
112 { 110 {
113 return GetUserProfile(firstName + " " + lastName); 111 return GetUserProfile(firstName + " " + lastName);
114 } 112 }
115 113
116
117 public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query) 114 public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query)
118 { 115 {
119 List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>(); 116 List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>();
@@ -138,6 +135,7 @@ namespace OpenSim.Region.Communications.OGS1
138 } 135 }
139 return pickerlist; 136 return pickerlist;
140 } 137 }
138
141 public UserProfileData GetUserProfile(string name) 139 public UserProfileData GetUserProfile(string name)
142 { 140 {
143 try 141 try
@@ -213,4 +211,4 @@ namespace OpenSim.Region.Communications.OGS1
213 throw new Exception("The method or operation is not implemented."); 211 throw new Exception("The method or operation is not implemented.");
214 } 212 }
215 } 213 }
216} \ No newline at end of file 214}