diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs (renamed from OpenSim/OpenSim.Region/Scenes/Scene.cs) | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index f7d90fa..8c912d0 100644 --- a/OpenSim/OpenSim.Region/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -39,18 +39,20 @@ using OpenSim.Framework.Interfaces; | |||
39 | using OpenSim.Framework.Types; | 39 | using OpenSim.Framework.Types; |
40 | using OpenSim.Framework.Inventory; | 40 | using OpenSim.Framework.Inventory; |
41 | using OpenSim.Framework; | 41 | using OpenSim.Framework; |
42 | using OpenSim.Terrain; | 42 | using OpenSim.Region.Terrain; |
43 | using OpenGrid.Framework.Communications; | 43 | using OpenSim.Framework.Communications; |
44 | using OpenSim.Caches; | 44 | using OpenSim.Region.Caches; |
45 | using OpenSim.Region; | 45 | using OpenSim.Region.Environment; |
46 | using OpenSim.Servers; | 46 | using OpenSim.Framework.Servers; |
47 | using OpenSim.Scripting; | 47 | using OpenSim.Region.Enviorment.Scripting; |
48 | 48 | using OpenSim.Region.Capabilities; | |
49 | namespace OpenSim.Region.Scenes | 49 | using Caps = OpenSim.Region.Capabilities.Caps; |
50 | |||
51 | namespace OpenSim.Region.Environment.Scenes | ||
50 | { | 52 | { |
51 | public delegate bool FilterAvatarList(ScenePresence avatar); | 53 | public delegate bool FilterAvatarList(ScenePresence avatar); |
52 | 54 | ||
53 | public partial class Scene : SceneBase, ILocalStorageReceiver, IScriptAPI | 55 | public partial class Scene : SceneBase, ILocalStorageReceiver |
54 | { | 56 | { |
55 | protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer(); | 57 | protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer(); |
56 | protected Dictionary<libsecondlife.LLUUID, ScenePresence> Avatars; | 58 | protected Dictionary<libsecondlife.LLUUID, ScenePresence> Avatars; |
@@ -66,7 +68,7 @@ namespace OpenSim.Region.Scenes | |||
66 | protected RegionCommsListener regionCommsHost; | 68 | protected RegionCommsListener regionCommsHost; |
67 | protected CommunicationsManager commsManager; | 69 | protected CommunicationsManager commsManager; |
68 | 70 | ||
69 | protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>(); | 71 | protected Dictionary<LLUUID,Caps> capsHandlers = new Dictionary<LLUUID, Caps>(); |
70 | protected BaseHttpServer httpListener; | 72 | protected BaseHttpServer httpListener; |
71 | 73 | ||
72 | public ParcelManager parcelManager; | 74 | public ParcelManager parcelManager; |
@@ -503,6 +505,7 @@ namespace OpenSim.Region.Scenes | |||
503 | remoteClient.OnTeleportLocationRequest += this.RequestTeleportLocation; | 505 | remoteClient.OnTeleportLocationRequest += this.RequestTeleportLocation; |
504 | //remoteClient.OnObjectSelect += this.SelectPrim; | 506 | //remoteClient.OnObjectSelect += this.SelectPrim; |
505 | remoteClient.OnGrapUpdate += this.MoveObject; | 507 | remoteClient.OnGrapUpdate += this.MoveObject; |
508 | remoteClient.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest; | ||
506 | 509 | ||
507 | /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest); | 510 | /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest); |
508 | remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest); | 511 | remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest); |
@@ -510,7 +513,7 @@ namespace OpenSim.Region.Scenes | |||
510 | remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest); | 513 | remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest); |
511 | remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage); | 514 | remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage); |
512 | */ | 515 | */ |
513 | 516 | ||
514 | ScenePresence newAvatar = null; | 517 | ScenePresence newAvatar = null; |
515 | try | 518 | try |
516 | { | 519 | { |