aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Local
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications/Local')
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs26
-rw-r--r--OpenSim/Region/Communications/Local/LocalInventoryService.cs8
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs12
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs4
4 files changed, 25 insertions, 25 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index a2c3c2c..aabddc6 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using libsecondlife; 32using OpenMetaverse;
33using log4net; 33using log4net;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
@@ -177,7 +177,7 @@ namespace OpenSim.Region.Communications.Local
177 return null; 177 return null;
178 } 178 }
179 179
180 public RegionInfo RequestNeighbourInfo(LLUUID regionID) 180 public RegionInfo RequestNeighbourInfo(UUID regionID)
181 { 181 {
182 // TODO add a dictionary for faster lookup 182 // TODO add a dictionary for faster lookup
183 foreach (RegionInfo info in m_regions.Values) 183 foreach (RegionInfo info in m_regions.Values)
@@ -229,7 +229,7 @@ namespace OpenSim.Region.Communications.Local
229 return mapBlocks; 229 return mapBlocks;
230 } 230 }
231 231
232 public bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) 232 public bool TellRegionToCloseChildConnection(ulong regionHandle, UUID agentID)
233 { 233 {
234 if (m_regionListeners.ContainsKey(regionHandle)) 234 if (m_regionListeners.ContainsKey(regionHandle))
235 { 235 {
@@ -306,7 +306,7 @@ namespace OpenSim.Region.Communications.Local
306 return false; 306 return false;
307 } 307 }
308 308
309 public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) 309 public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, UUID agentID)
310 { 310 {
311 if (m_regionListeners.ContainsKey(regionHandle)) 311 if (m_regionListeners.ContainsKey(regionHandle))
312 { 312 {
@@ -338,7 +338,7 @@ namespace OpenSim.Region.Communications.Local
338 return false; 338 return false;
339 } 339 }
340 340
341 public bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData, int XMLMethod) 341 public bool InformRegionOfPrimCrossing(ulong regionHandle, UUID primID, string objData, int XMLMethod)
342 { 342 {
343 if (m_regionListeners.ContainsKey(regionHandle)) 343 if (m_regionListeners.ContainsKey(regionHandle))
344 { 344 {
@@ -355,7 +355,7 @@ namespace OpenSim.Region.Communications.Local
355 /// <param name="agentID"></param> 355 /// <param name="agentID"></param>
356 /// <param name="position"></param> 356 /// <param name="position"></param>
357 /// <returns></returns> 357 /// <returns></returns>
358 public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) 358 public bool ExpectAvatarCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isFlying)
359 { 359 {
360 if (m_regionListeners.ContainsKey(regionHandle)) 360 if (m_regionListeners.ContainsKey(regionHandle))
361 { 361 {
@@ -366,7 +366,7 @@ namespace OpenSim.Region.Communications.Local
366 return false; 366 return false;
367 } 367 }
368 368
369 public bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical) 369 public bool ExpectPrimCrossing(ulong regionHandle, UUID primID, Vector3 position, bool isPhysical)
370 { 370 {
371 if (m_regionListeners.ContainsKey(regionHandle)) 371 if (m_regionListeners.ContainsKey(regionHandle))
372 { 372 {
@@ -376,7 +376,7 @@ namespace OpenSim.Region.Communications.Local
376 return false; 376 return false;
377 } 377 }
378 378
379 public bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId) 379 public bool AcknowledgeAgentCrossed(ulong regionHandle, UUID agentId)
380 { 380 {
381 if (m_regionListeners.ContainsKey(regionHandle)) 381 if (m_regionListeners.ContainsKey(regionHandle))
382 { 382 {
@@ -385,7 +385,7 @@ namespace OpenSim.Region.Communications.Local
385 return false; 385 return false;
386 } 386 }
387 387
388 public bool AcknowledgePrimCrossed(ulong regionHandle, LLUUID primID) 388 public bool AcknowledgePrimCrossed(ulong regionHandle, UUID primID)
389 { 389 {
390 if (m_regionListeners.ContainsKey(regionHandle)) 390 if (m_regionListeners.ContainsKey(regionHandle))
391 { 391 {
@@ -430,7 +430,7 @@ namespace OpenSim.Region.Communications.Local
430 } 430 }
431 } 431 }
432 432
433 public void TriggerLogOffUser(ulong regionHandle, LLUUID agentID, LLUUID RegionSecret, string message) 433 public void TriggerLogOffUser(ulong regionHandle, UUID agentID, UUID RegionSecret, string message)
434 { 434 {
435 if (m_regionListeners.ContainsKey(regionHandle)) 435 if (m_regionListeners.ContainsKey(regionHandle))
436 { 436 {
@@ -440,7 +440,7 @@ namespace OpenSim.Region.Communications.Local
440 } 440 }
441 } 441 }
442 442
443 public void TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData, int XMLMethod) 443 public void TriggerExpectPrim(ulong regionHandle, UUID primID, string objData, int XMLMethod)
444 { 444 {
445 if (m_regionListeners.ContainsKey(regionHandle)) 445 if (m_regionListeners.ContainsKey(regionHandle))
446 { 446 {
@@ -461,7 +461,7 @@ namespace OpenSim.Region.Communications.Local
461 } 461 }
462 } 462 }
463 463
464 public bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) 464 public bool TriggerExpectAvatarCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isFlying)
465 { 465 {
466 if (m_regionListeners.ContainsKey(regionHandle)) 466 if (m_regionListeners.ContainsKey(regionHandle))
467 { 467 {
@@ -472,7 +472,7 @@ namespace OpenSim.Region.Communications.Local
472 return false; 472 return false;
473 } 473 }
474 474
475 public bool TriggerExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical) 475 public bool TriggerExpectPrimCrossing(ulong regionHandle, UUID primID, Vector3 position, bool isPhysical)
476 { 476 {
477 if (m_regionListeners.ContainsKey(regionHandle)) 477 if (m_regionListeners.ContainsKey(regionHandle))
478 { 478 {
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index 1d8ea53..5cb33cc 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -27,7 +27,7 @@
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Reflection; 29using System.Reflection;
30using libsecondlife; 30using OpenMetaverse;
31using log4net; 31using log4net;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Communications; 33using OpenSim.Framework.Communications;
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Communications.Local
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 public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback) 47 public override void RequestInventoryForUser(UUID userID, InventoryReceiptCallback callback)
48 { 48 {
49 m_log.InfoFormat("[LOCAL INVENTORY SERVICE]: Requesting inventory for user {0}", userID); 49 m_log.InfoFormat("[LOCAL INVENTORY SERVICE]: Requesting inventory for user {0}", userID);
50 50
@@ -60,7 +60,7 @@ namespace OpenSim.Region.Communications.Local
60 // Need to retrieve the root folder on the first pass 60 // Need to retrieve the root folder on the first pass
61 foreach (InventoryFolderBase folder in skeletonFolders) 61 foreach (InventoryFolderBase folder in skeletonFolders)
62 { 62 {
63 if (folder.ParentID == LLUUID.Zero) 63 if (folder.ParentID == UUID.Zero)
64 { 64 {
65 rootFolder = new InventoryFolderImpl(folder); 65 rootFolder = new InventoryFolderImpl(folder);
66 folders.Add(rootFolder); 66 folders.Add(rootFolder);
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Communications.Local
88 callback(folders, items); 88 callback(folders, items);
89 } 89 }
90 90
91 public override bool HasInventoryForUser(LLUUID userID) 91 public override bool HasInventoryForUser(UUID userID)
92 { 92 {
93 InventoryFolderBase root = RequestRootFolder(userID); 93 InventoryFolderBase root = RequestRootFolder(userID);
94 if (root == null) 94 if (root == null)
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index aeb9ae0..518ba09 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -30,7 +30,7 @@ using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications; 36using OpenSim.Framework.Communications;
@@ -246,9 +246,9 @@ namespace OpenSim.Region.Communications.Local
246 _login.SecureSession = response.SecureSessionID; 246 _login.SecureSession = response.SecureSessionID;
247 _login.CircuitCode = (uint) response.CircuitCode; 247 _login.CircuitCode = (uint) response.CircuitCode;
248 if (specificStartLocation) 248 if (specificStartLocation)
249 _login.StartPos = new LLVector3(locX, locY, locZ); 249 _login.StartPos = new Vector3(locX, locY, locZ);
250 else 250 else
251 _login.StartPos = new LLVector3(128, 128, 128); 251 _login.StartPos = new Vector3(128, 128, 128);
252 _login.CapsPath = capsPath; 252 _login.CapsPath = capsPath;
253 253
254 m_log.InfoFormat( 254 m_log.InfoFormat(
@@ -282,7 +282,7 @@ namespace OpenSim.Region.Communications.Local
282 } 282 }
283 283
284 // See LoginService 284 // See LoginService
285 protected override InventoryData GetInventorySkeleton(LLUUID userID) 285 protected override InventoryData GetInventorySkeleton(UUID userID)
286 { 286 {
287 List<InventoryFolderBase> folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID); 287 List<InventoryFolderBase> folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID);
288 288
@@ -293,12 +293,12 @@ namespace OpenSim.Region.Communications.Local
293 folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID); 293 folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID);
294 } 294 }
295 295
296 LLUUID rootID = LLUUID.Zero; 296 UUID rootID = UUID.Zero;
297 ArrayList AgentInventoryArray = new ArrayList(); 297 ArrayList AgentInventoryArray = new ArrayList();
298 Hashtable TempHash; 298 Hashtable TempHash;
299 foreach (InventoryFolderBase InvFolder in folders) 299 foreach (InventoryFolderBase InvFolder in folders)
300 { 300 {
301 if (InvFolder.ParentID == LLUUID.Zero) 301 if (InvFolder.ParentID == UUID.Zero)
302 { 302 {
303 rootID = InvFolder.ID; 303 rootID = InvFolder.ID;
304 } 304 }
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 2ee7981..c0887df 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using libsecondlife; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Framework.Communications; 31using OpenSim.Framework.Communications;
32 32
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Communications.Local
88 return profile; 88 return profile;
89 } 89 }
90 90
91 public override UserProfileData SetupMasterUser(LLUUID uuid) 91 public override UserProfileData SetupMasterUser(UUID uuid)
92 { 92 {
93 UserProfileData data = GetUserProfile(uuid); 93 UserProfileData data = GetUserProfile(uuid);
94 if (data == null) 94 if (data == null)