OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Apparently, we need to tell ParcelManager that there is no parcels. 

* Cleaning lady cleaning build ignores (No, MW, I don't mind, anything for you)
afrisby
lbsa71 2007-07-14 14:13:05 +00:00
parent a04602d9c1
commit 1a92dc9073
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -230,7 +230,7 @@ namespace OpenSim
if (masterAvatar != null) if (masterAvatar != null)
{ {
LocalWorld.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID; LocalWorld.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID;
LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager); LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.ParcelManager);
} }
LocalWorld.StartTimer(); LocalWorld.StartTimer();

2
OpenSim/Region/Environment/ParcelManager.cs
View File

@ -664,7 +664,7 @@ namespace OpenSim.Region.Environment
List<Avatar> avatars = m_world.RequestAvatarList(); List<Avatar> avatars = m_world.RequestAvatarList();
for (int i = 0; i < avatars.Count; i++) for (int i = 0; i < avatars.Count; i++)
{ {
Parcel over = m_world.parcelManager.getParcel((int)Math.Round(avatars[i].Pos.X), (int)Math.Round(avatars[i].Pos.Y)); Parcel over = m_world.ParcelManager.getParcel((int)Math.Round(avatars[i].Pos.X), (int)Math.Round(avatars[i].Pos.Y));
if (over.parcelData.localID == this.parcelData.localID) if (over.parcelData.localID == this.parcelData.localID)
{ {
sendParcelProperties(0, false, 0, avatars[i].ControllingClient); sendParcelProperties(0, false, 0, avatars[i].ControllingClient);

22
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -68,7 +68,6 @@ namespace OpenSim.Region.Environment.Scenes
protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>(); protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>();
protected BaseHttpServer httpListener; protected BaseHttpServer httpListener;
public ParcelManager parcelManager;
public EstateManager estateManager; public EstateManager estateManager;
public EventManager eventManager; public EventManager eventManager;
public ScriptManager scriptManager; public ScriptManager scriptManager;
@ -89,6 +88,13 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
private ParcelManager m_parcelManager;
public ParcelManager ParcelManager
{
get { return m_parcelManager; }
}
#endregion #endregion
#region Constructors #region Constructors
@ -111,7 +117,7 @@ namespace OpenSim.Region.Environment.Scenes
this.m_datastore = m_regInfo.DataStore; this.m_datastore = m_regInfo.DataStore;
this.RegisterRegionWithComms(); this.RegisterRegionWithComms();
parcelManager = new ParcelManager(this, this.m_regInfo); m_parcelManager = new ParcelManager(this, this.m_regInfo);
estateManager = new EstateManager(this, this.m_regInfo); estateManager = new EstateManager(this, this.m_regInfo);
scriptManager = new ScriptManager(this); scriptManager = new ScriptManager(this);
eventManager = new EventManager(); eventManager = new EventManager();
@ -449,7 +455,7 @@ namespace OpenSim.Region.Environment.Scenes
SubscribeToClientEvents(client); SubscribeToClientEvents(client);
this.estateManager.sendRegionHandshake(client); this.estateManager.sendRegionHandshake(client);
CreateAndAddScenePresence(client); CreateAndAddScenePresence(client);
this.parcelManager.sendParcelOverlay(client); this.m_parcelManager.sendParcelOverlay(client);
} }
@ -479,10 +485,10 @@ namespace OpenSim.Region.Environment.Scenes
client.OnLinkObjects += this.LinkObjects; client.OnLinkObjects += this.LinkObjects;
client.OnObjectDuplicate += this.DuplicateObject; client.OnObjectDuplicate += this.DuplicateObject;
client.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest); client.OnParcelPropertiesRequest += new ParcelPropertiesRequest(m_parcelManager.handleParcelPropertiesRequest);
client.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest); client.OnParcelDivideRequest += new ParcelDivideRequest(m_parcelManager.handleParcelDivideRequest);
client.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest); client.OnParcelJoinRequest += new ParcelJoinRequest(m_parcelManager.handleParcelJoinRequest);
client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest); client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(m_parcelManager.handleParcelPropertiesUpdateRequest);
client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage); client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
} }
@ -524,7 +530,7 @@ namespace OpenSim.Region.Environment.Scenes
this.Avatars.Add(client.AgentId, newAvatar); this.Avatars.Add(client.AgentId, newAvatar);
} }
} }
newAvatar.OnSignificantClientMovement += parcelManager.handleSignificantClientMovement; newAvatar.OnSignificantClientMovement += m_parcelManager.handleSignificantClientMovement;
return newAvatar; return newAvatar;
} }

3
OpenSim/Region/Examples/SimpleApp/Program.cs
View File

@ -60,7 +60,10 @@ namespace SimpleApp
world = new MyWorld(packetServer.ClientManager, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer); world = new MyWorld(packetServer.ClientManager, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer);
world.PhysScene = physManager.GetPhysicsScene("basicphysics"); //PhysicsScene.Null; world.PhysScene = physManager.GetPhysicsScene("basicphysics"); //PhysicsScene.Null;
world.LoadWorldMap(); world.LoadWorldMap();
world.ParcelManager.NoParcelDataFromStorage();
udpServer.LocalWorld = world; udpServer.LocalWorld = world;
httpServer.Start(); httpServer.Start();