diff options
author | lbsa71 | 2007-12-27 21:41:48 +0000 |
---|---|---|
committer | lbsa71 | 2007-12-27 21:41:48 +0000 |
commit | efd90b56b761219af6425b1c7a2cdd3b6ffb4de2 (patch) | |
tree | bf5b897e1e3c13211e3e2fc61d30508b94c928c0 /OpenSim/Region/Communications/Local | |
parent | * removed always true if (diff) | |
download | opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.zip opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.gz opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.bz2 opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.xz |
* Optimized usings
* shortened references
* Removed redundant 'this'
* Normalized EOF
Diffstat (limited to '')
5 files changed, 35 insertions, 34 deletions
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs index 937f7c4..575d9d5 100644 --- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs +++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs | |||
@@ -50,4 +50,4 @@ namespace OpenSim.Region.Communications.Local | |||
50 | m_interRegion = interRegionService; | 50 | m_interRegion = interRegionService; |
51 | } | 51 | } |
52 | } | 52 | } |
53 | } | 53 | } \ No newline at end of file |
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs index f6137f7..4dec884 100644 --- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs +++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs | |||
@@ -29,8 +29,8 @@ using System.Collections; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using libsecondlife; | 30 | using libsecondlife; |
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Framework.Console; | ||
33 | using OpenSim.Framework.Communications; | 32 | using OpenSim.Framework.Communications; |
33 | using OpenSim.Framework.Console; | ||
34 | 34 | ||
35 | namespace OpenSim.Region.Communications.Local | 35 | namespace OpenSim.Region.Communications.Local |
36 | { | 36 | { |
@@ -50,21 +50,17 @@ namespace OpenSim.Region.Communications.Local | |||
50 | public string gdebugRegionName | 50 | public string gdebugRegionName |
51 | { | 51 | { |
52 | get { return _gdebugRegionName; } | 52 | get { return _gdebugRegionName; } |
53 | set | 53 | set { _gdebugRegionName = value; } |
54 | { | ||
55 | _gdebugRegionName = value; | ||
56 | } | ||
57 | } | 54 | } |
55 | |||
58 | public string _rdebugRegionName = ""; | 56 | public string _rdebugRegionName = ""; |
59 | 57 | ||
60 | public string rdebugRegionName | 58 | public string rdebugRegionName |
61 | { | 59 | { |
62 | get { return _rdebugRegionName; } | 60 | get { return _rdebugRegionName; } |
63 | set | 61 | set { _rdebugRegionName = value; } |
64 | { | ||
65 | _rdebugRegionName = value; | ||
66 | } | ||
67 | } | 62 | } |
63 | |||
68 | public LocalBackEndServices() | 64 | public LocalBackEndServices() |
69 | { | 65 | { |
70 | } | 66 | } |
@@ -85,7 +81,8 @@ namespace OpenSim.Region.Communications.Local | |||
85 | RegionCommsListener regionHost = new RegionCommsListener(); | 81 | RegionCommsListener regionHost = new RegionCommsListener(); |
86 | if (m_regionListeners.ContainsKey(regionInfo.RegionHandle)) | 82 | if (m_regionListeners.ContainsKey(regionInfo.RegionHandle)) |
87 | { | 83 | { |
88 | 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."); | 84 | MainLog.Instance.Error("INTERREGION", |
85 | "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."); | ||
89 | m_regionListeners.Remove(regionInfo.RegionHandle); | 86 | m_regionListeners.Remove(regionInfo.RegionHandle); |
90 | } | 87 | } |
91 | m_regionListeners.Add(regionInfo.RegionHandle, regionHost); | 88 | m_regionListeners.Add(regionInfo.RegionHandle, regionHost); |
@@ -195,7 +192,7 @@ namespace OpenSim.Region.Communications.Local | |||
195 | return mapBlocks; | 192 | return mapBlocks; |
196 | } | 193 | } |
197 | 194 | ||
198 | 195 | ||
199 | public virtual bool RegionUp(SearializableRegionInfo sregion, ulong regionhandle) | 196 | public virtual bool RegionUp(SearializableRegionInfo sregion, ulong regionhandle) |
200 | { | 197 | { |
201 | RegionInfo region = new RegionInfo(sregion); | 198 | RegionInfo region = new RegionInfo(sregion); |
@@ -203,7 +200,7 @@ namespace OpenSim.Region.Communications.Local | |||
203 | { | 200 | { |
204 | return m_regionListeners[regionhandle].TriggerRegionUp(region); | 201 | return m_regionListeners[regionhandle].TriggerRegionUp(region); |
205 | } | 202 | } |
206 | 203 | ||
207 | return false; | 204 | return false; |
208 | } | 205 | } |
209 | 206 | ||
@@ -224,7 +221,7 @@ namespace OpenSim.Region.Communications.Local | |||
224 | // It never gets called. | 221 | // It never gets called. |
225 | public virtual Dictionary<string, string> GetGridSettings() | 222 | public virtual Dictionary<string, string> GetGridSettings() |
226 | { | 223 | { |
227 | Dictionary<string,string> returnGridSettings = new Dictionary<string,string>(); | 224 | Dictionary<string, string> returnGridSettings = new Dictionary<string, string>(); |
228 | lock (m_queuedGridSettings) | 225 | lock (m_queuedGridSettings) |
229 | { | 226 | { |
230 | returnGridSettings = m_queuedGridSettings; | 227 | returnGridSettings = m_queuedGridSettings; |
@@ -237,7 +234,6 @@ namespace OpenSim.Region.Communications.Local | |||
237 | public virtual void SetForcefulBanlistsDisallowed(ulong regionHandle) | 234 | public virtual void SetForcefulBanlistsDisallowed(ulong regionHandle) |
238 | { | 235 | { |
239 | m_queuedGridSettings.Add("allow_forceful_banlines", "FALSE"); | 236 | m_queuedGridSettings.Add("allow_forceful_banlines", "FALSE"); |
240 | |||
241 | } | 237 | } |
242 | 238 | ||
243 | public bool TriggerRegionUp(RegionInfo region, ulong regionhandle) | 239 | public bool TriggerRegionUp(RegionInfo region, ulong regionhandle) |
@@ -254,7 +250,7 @@ namespace OpenSim.Region.Communications.Local | |||
254 | { | 250 | { |
255 | if (m_regionListeners.ContainsKey(regionHandle)) | 251 | if (m_regionListeners.ContainsKey(regionHandle)) |
256 | { | 252 | { |
257 | return m_regionListeners[regionHandle].TriggerChildAgentUpdate(regionHandle,cAgentData); | 253 | return m_regionListeners[regionHandle].TriggerChildAgentUpdate(regionHandle, cAgentData); |
258 | } | 254 | } |
259 | return false; | 255 | return false; |
260 | } | 256 | } |
@@ -282,7 +278,7 @@ namespace OpenSim.Region.Communications.Local | |||
282 | return false; | 278 | return false; |
283 | } | 279 | } |
284 | 280 | ||
285 | public bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData) | 281 | public bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData) |
286 | { | 282 | { |
287 | if (m_regionListeners.ContainsKey(regionHandle)) | 283 | if (m_regionListeners.ContainsKey(regionHandle)) |
288 | { | 284 | { |
@@ -291,6 +287,7 @@ namespace OpenSim.Region.Communications.Local | |||
291 | } | 287 | } |
292 | return false; | 288 | return false; |
293 | } | 289 | } |
290 | |||
294 | /// <summary> | 291 | /// <summary> |
295 | /// | 292 | /// |
296 | /// </summary> | 293 | /// </summary> |
@@ -308,6 +305,7 @@ namespace OpenSim.Region.Communications.Local | |||
308 | } | 305 | } |
309 | return false; | 306 | return false; |
310 | } | 307 | } |
308 | |||
311 | public bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical) | 309 | public bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical) |
312 | { | 310 | { |
313 | if (m_regionListeners.ContainsKey(regionHandle)) | 311 | if (m_regionListeners.ContainsKey(regionHandle)) |
@@ -322,7 +320,7 @@ namespace OpenSim.Region.Communications.Local | |||
322 | { | 320 | { |
323 | if (m_regionListeners.ContainsKey(regionHandle)) | 321 | if (m_regionListeners.ContainsKey(regionHandle)) |
324 | { | 322 | { |
325 | m_regionListeners[regionHandle].TriggerCloseAgentConnection(regionHandle, agentID); | 323 | m_regionListeners[regionHandle].TriggerCloseAgentConnection(regionHandle, agentID); |
326 | } | 324 | } |
327 | } | 325 | } |
328 | 326 | ||
@@ -334,6 +332,7 @@ namespace OpenSim.Region.Communications.Local | |||
334 | } | 332 | } |
335 | return false; | 333 | return false; |
336 | } | 334 | } |
335 | |||
337 | public bool AcknowledgePrimCrossed(ulong regionHandle, LLUUID primID) | 336 | public bool AcknowledgePrimCrossed(ulong regionHandle, LLUUID primID) |
338 | { | 337 | { |
339 | if (m_regionListeners.ContainsKey(regionHandle)) | 338 | if (m_regionListeners.ContainsKey(regionHandle)) |
@@ -415,14 +414,15 @@ namespace OpenSim.Region.Communications.Local | |||
415 | { | 414 | { |
416 | if (m_regionListeners.ContainsKey(regionHandle)) | 415 | if (m_regionListeners.ContainsKey(regionHandle)) |
417 | { | 416 | { |
418 | return m_regionListeners[regionHandle].TriggerExpectPrimCrossing(regionHandle, primID, position, isPhysical); | 417 | return |
418 | m_regionListeners[regionHandle].TriggerExpectPrimCrossing(regionHandle, primID, position, isPhysical); | ||
419 | } | 419 | } |
420 | return false; | 420 | return false; |
421 | } | 421 | } |
422 | 422 | ||
423 | public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData) | 423 | public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData) |
424 | { | 424 | { |
425 | // MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Other local region is sending child agent our way: " + agentData.firstname + " " + agentData.lastname); | 425 | // MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Other local region is sending child agent our way: " + agentData.firstname + " " + agentData.lastname); |
426 | 426 | ||
427 | if (m_regionListeners.ContainsKey(regionHandle)) | 427 | if (m_regionListeners.ContainsKey(regionHandle)) |
428 | { | 428 | { |
@@ -435,4 +435,4 @@ namespace OpenSim.Region.Communications.Local | |||
435 | return false; | 435 | return false; |
436 | } | 436 | } |
437 | } | 437 | } |
438 | } | 438 | } \ No newline at end of file |
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs index 08bd850..730c40f 100644 --- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs +++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs | |||
@@ -82,14 +82,14 @@ namespace OpenSim.Region.Communications.Local | |||
82 | { | 82 | { |
83 | DeleteItem(item); | 83 | DeleteItem(item); |
84 | } | 84 | } |
85 | 85 | ||
86 | /// <summary> | 86 | /// <summary> |
87 | /// Send the given inventory folder and its item contents back to the requester. | 87 | /// Send the given inventory folder and its item contents back to the requester. |
88 | /// </summary> | 88 | /// </summary> |
89 | /// <param name="userID"></param> | 89 | /// <param name="userID"></param> |
90 | /// <param name="folder"></param> | 90 | /// <param name="folder"></param> |
91 | private InventoryFolderImpl RequestInventoryFolder(LLUUID userID, InventoryFolderBase folder, | 91 | private InventoryFolderImpl RequestInventoryFolder(LLUUID userID, InventoryFolderBase folder, |
92 | InventoryFolderInfo folderCallBack, | 92 | InventoryFolderInfo folderCallBack, |
93 | InventoryItemInfo itemCallBack) | 93 | InventoryItemInfo itemCallBack) |
94 | { | 94 | { |
95 | InventoryFolderImpl newFolder = new InventoryFolderImpl(folder); | 95 | InventoryFolderImpl newFolder = new InventoryFolderImpl(folder); |
@@ -99,9 +99,9 @@ namespace OpenSim.Region.Communications.Local | |||
99 | foreach (InventoryItemBase item in items) | 99 | foreach (InventoryItemBase item in items) |
100 | { | 100 | { |
101 | itemCallBack(userID, item); | 101 | itemCallBack(userID, item); |
102 | } | 102 | } |
103 | 103 | ||
104 | return newFolder; | 104 | return newFolder; |
105 | } | 105 | } |
106 | } | 106 | } |
107 | } | 107 | } \ No newline at end of file |
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs index 2c08707..bf5f205 100644 --- a/OpenSim/Region/Communications/Local/LocalLoginService.cs +++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs | |||
@@ -73,7 +73,7 @@ namespace OpenSim.Region.Communications.Local | |||
73 | if (!authUsers) | 73 | if (!authUsers) |
74 | { | 74 | { |
75 | //no current user account so make one | 75 | //no current user account so make one |
76 | MainLog.Instance.Notice("LOGIN", "No user account found so creating a new one."); | 76 | MainLog.Instance.Notice("LOGIN", "No user account found so creating a new one."); |
77 | 77 | ||
78 | m_userManager.AddUserProfile(firstname, lastname, "test", defaultHomeX, defaultHomeY); | 78 | m_userManager.AddUserProfile(firstname, lastname, "test", defaultHomeX, defaultHomeY); |
79 | 79 | ||
@@ -93,14 +93,14 @@ namespace OpenSim.Region.Communications.Local | |||
93 | if (!authUsers) | 93 | if (!authUsers) |
94 | { | 94 | { |
95 | //for now we will accept any password in sandbox mode | 95 | //for now we will accept any password in sandbox mode |
96 | MainLog.Instance.Notice("LOGIN", "Authorising user (no actual password check)"); | 96 | MainLog.Instance.Notice("LOGIN", "Authorising user (no actual password check)"); |
97 | 97 | ||
98 | return true; | 98 | return true; |
99 | } | 99 | } |
100 | else | 100 | else |
101 | { | 101 | { |
102 | MainLog.Instance.Notice( | 102 | MainLog.Instance.Notice( |
103 | "LOGIN", "Authenticating " + profile.username + " " + profile.surname); | 103 | "LOGIN", "Authenticating " + profile.username + " " + profile.surname); |
104 | 104 | ||
105 | password = password.Remove(0, 3); //remove $1$ | 105 | password = password.Remove(0, 3); //remove $1$ |
106 | 106 | ||
@@ -134,7 +134,7 @@ namespace OpenSim.Region.Communications.Local | |||
134 | // response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CapsSeed/" + capsPath + "0000/"; | 134 | // response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CapsSeed/" + capsPath + "0000/"; |
135 | theUser.currentAgent.currentRegion = reg.RegionID; | 135 | theUser.currentAgent.currentRegion = reg.RegionID; |
136 | theUser.currentAgent.currentHandle = reg.RegionHandle; | 136 | theUser.currentAgent.currentHandle = reg.RegionHandle; |
137 | 137 | ||
138 | LoginResponse.BuddyList buddyList = new LoginResponse.BuddyList(); | 138 | LoginResponse.BuddyList buddyList = new LoginResponse.BuddyList(); |
139 | buddyList.AddNewBuddy(new LoginResponse.BuddyList.BuddyInfo("11111111-1111-0000-0000-000100bba000")); | 139 | buddyList.AddNewBuddy(new LoginResponse.BuddyList.BuddyInfo("11111111-1111-0000-0000-000100bba000")); |
140 | response.BuddList = buddyList; | 140 | response.BuddList = buddyList; |
@@ -157,7 +157,7 @@ namespace OpenSim.Region.Communications.Local | |||
157 | } | 157 | } |
158 | else | 158 | else |
159 | { | 159 | { |
160 | MainLog.Instance.Warn("LOGIN", "Not found region " + currentRegion); | 160 | MainLog.Instance.Warn("LOGIN", "Not found region " + currentRegion); |
161 | } | 161 | } |
162 | } | 162 | } |
163 | 163 | ||
@@ -207,4 +207,4 @@ namespace OpenSim.Region.Communications.Local | |||
207 | } | 207 | } |
208 | } | 208 | } |
209 | } | 209 | } |
210 | } | 210 | } \ No newline at end of file |
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs index d8c4b1d..6269565 100644 --- a/OpenSim/Region/Communications/Local/LocalUserServices.cs +++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs | |||
@@ -27,6 +27,7 @@ | |||
27 | */ | 27 | */ |
28 | 28 | ||
29 | using System; | 29 | using System; |
30 | using libsecondlife; | ||
30 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
31 | using OpenSim.Framework.Communications; | 32 | using OpenSim.Framework.Communications; |
32 | using OpenSim.Framework.UserManagement; | 33 | using OpenSim.Framework.UserManagement; |
@@ -82,7 +83,7 @@ namespace OpenSim.Region.Communications.Local | |||
82 | return profile; | 83 | return profile; |
83 | } | 84 | } |
84 | 85 | ||
85 | public override UserProfileData SetupMasterUser(libsecondlife.LLUUID uuid) | 86 | public override UserProfileData SetupMasterUser(LLUUID uuid) |
86 | { | 87 | { |
87 | UserProfileData data = GetUserProfile(uuid); | 88 | UserProfileData data = GetUserProfile(uuid); |
88 | if (data == null) | 89 | if (data == null) |