aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-04-06 13:04:46 +0000
committerMW2007-04-06 13:04:46 +0000
commit802d443be8c017ff32cd742fa8570cf582721bf6 (patch)
treea6bcf4e9de65d7ed4a3976c845634cd0c2d27fca
parentmore work on Primitive2 (diff)
downloadopensim-SC_OLD-802d443be8c017ff32cd742fa8570cf582721bf6.zip
opensim-SC_OLD-802d443be8c017ff32cd742fa8570cf582721bf6.tar.gz
opensim-SC_OLD-802d443be8c017ff32cd742fa8570cf582721bf6.tar.bz2
opensim-SC_OLD-802d443be8c017ff32cd742fa8570cf582721bf6.tar.xz
very very few changes, but just commiting so that svn it upto date with my local version. And also to keep robl^ happy that a commit has been made.
-rw-r--r--OpenSim.RegionServer/world/AvatarClient.cs8
-rw-r--r--OpenSim.RegionServer/world/Primitive2.cs2
-rw-r--r--OpenSim.RegionServer/world/World.cs4
3 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim.RegionServer/world/AvatarClient.cs b/OpenSim.RegionServer/world/AvatarClient.cs
index bad8761..7656a89 100644
--- a/OpenSim.RegionServer/world/AvatarClient.cs
+++ b/OpenSim.RegionServer/world/AvatarClient.cs
@@ -8,7 +8,8 @@ namespace OpenSim.world
8 partial class Avatar 8 partial class Avatar
9 { 9 {
10 private List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> updateList = new List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>(); 10 private List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> updateList = new List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>();
11 11 private List<Entity> interestList = new List<Entity>();
12
12 public void SendPacketToViewer(Packet packet) 13 public void SendPacketToViewer(Packet packet)
13 { 14 {
14 this.ControllingClient.OutPacket(packet); 15 this.ControllingClient.OutPacket(packet);
@@ -23,5 +24,10 @@ namespace OpenSim.world
23 { 24 {
24 25
25 } 26 }
27
28 private void UpdateInterestList()
29 {
30
31 }
26 } 32 }
27} 33}
diff --git a/OpenSim.RegionServer/world/Primitive2.cs b/OpenSim.RegionServer/world/Primitive2.cs
index 2ab1470..4b26fbe 100644
--- a/OpenSim.RegionServer/world/Primitive2.cs
+++ b/OpenSim.RegionServer/world/Primitive2.cs
@@ -201,7 +201,7 @@ namespace OpenSim.world
201 201
202 #endregion 202 #endregion
203 203
204 #region Update viewers methods 204 #region Update viewers Methods
205 205
206 public void SendFullUpdateToClient(SimClient remoteClient) 206 public void SendFullUpdateToClient(SimClient remoteClient)
207 { 207 {
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index 5e4a3d3..5b7b3a1 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -185,6 +185,8 @@ namespace OpenSim.world
185 return (store == null); 185 return (store == null);
186 } 186 }
187 187
188 #region Regenerate Terrain
189
188 public void RegenerateTerrain() 190 public void RegenerateTerrain()
189 { 191 {
190 HeightmapGenHills hills = new HeightmapGenHills(); 192 HeightmapGenHills hills = new HeightmapGenHills();
@@ -243,6 +245,8 @@ namespace OpenSim.world
243 } 245 }
244 } 246 }
245 247
248 #endregion
249
246 public void LoadWorldMap() 250 public void LoadWorldMap()
247 { 251 {
248 LandMap = this.localStorage.LoadWorld(); 252 LandMap = this.localStorage.LoadWorld();