aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.Region/Scene/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/OpenSim.Region/Scene/Scene.cs (renamed from OpenSim/OpenSim.Region/Scene/World.cs)4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/OpenSim.Region/Scene/World.cs b/OpenSim/OpenSim.Region/Scene/Scene.cs
index 40eb7ef..e3ffca4 100644
--- a/OpenSim/OpenSim.Region/Scene/World.cs
+++ b/OpenSim/OpenSim.Region/Scene/Scene.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region
49{ 49{
50 public delegate bool FilterAvatarList(Avatar avatar); 50 public delegate bool FilterAvatarList(Avatar avatar);
51 51
52 public partial class World : WorldBase, ILocalStorageReceiver, IScriptAPI 52 public partial class Scene : SceneBase, ILocalStorageReceiver, IScriptAPI
53 { 53 {
54 protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer(); 54 protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();
55 protected Dictionary<libsecondlife.LLUUID, Avatar> Avatars; 55 protected Dictionary<libsecondlife.LLUUID, Avatar> Avatars;
@@ -96,7 +96,7 @@ namespace OpenSim.Region
96 /// <param name="clientThreads">Dictionary to contain client threads</param> 96 /// <param name="clientThreads">Dictionary to contain client threads</param>
97 /// <param name="regionHandle">Region Handle for this region</param> 97 /// <param name="regionHandle">Region Handle for this region</param>
98 /// <param name="regionName">Region Name for this region</param> 98 /// <param name="regionName">Region Name for this region</param>
99 public World(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regInfo, AuthenticateSessionsBase authen, RegionServerCommsManager commsMan) 99 public Scene(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regInfo, AuthenticateSessionsBase authen, RegionServerCommsManager commsMan)
100 { 100 {
101 try 101 try
102 { 102 {