aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMW2007-08-09 12:59:42 +0000
committerMW2007-08-09 12:59:42 +0000
commita56a17fab20e1ef94e70dbf6648ebb2f437de364 (patch)
treee19a6a858725ffadbcf34c8f9a7409db350a5681 /OpenSim/Framework
parentTransition between not flying / flying should be smoother (diff)
downloadopensim-SC_OLD-a56a17fab20e1ef94e70dbf6648ebb2f437de364.zip
opensim-SC_OLD-a56a17fab20e1ef94e70dbf6648ebb2f437de364.tar.gz
opensim-SC_OLD-a56a17fab20e1ef94e70dbf6648ebb2f437de364.tar.bz2
opensim-SC_OLD-a56a17fab20e1ef94e70dbf6648ebb2f437de364.tar.xz
Making sure my local working copy is in sync with svn before I start the job of enabling the new SceneObject classes.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs8
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs2
-rw-r--r--OpenSim/Framework/General/Interfaces/IClientAPI.cs4
-rw-r--r--OpenSim/Framework/General/NullClientAPI.cs4
4 files changed, 10 insertions, 8 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index acdd593..3866e21 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -224,7 +224,7 @@ namespace OpenSim.Framework.Communications.Caches
224 lock (this.SendingTextures) 224 lock (this.SendingTextures)
225 { 225 {
226 this.SendingTextures.Remove(sender.request.ImageInfo.FullID); 226 this.SendingTextures.Remove(sender.request.ImageInfo.FullID);
227 this.AvatarRecievedTextures[sender.request.RequestUser.AgentId].Add(sender.request.ImageInfo.FullID); 227 // this.AvatarRecievedTextures[sender.request.RequestUser.AgentId].Add(sender.request.ImageInfo.FullID);
228 } 228 }
229 } 229 }
230 } 230 }
@@ -634,7 +634,8 @@ namespace OpenSim.Framework.Communications.Caches
634 public class TextureSender 634 public class TextureSender
635 { 635 {
636 public AssetRequest request; 636 public AssetRequest request;
637 637 private int counter = 0;
638
638 public TextureSender(AssetRequest req) 639 public TextureSender(AssetRequest req)
639 { 640 {
640 request = req; 641 request = req;
@@ -644,8 +645,9 @@ namespace OpenSim.Framework.Communications.Caches
644 public bool SendTexture() 645 public bool SendTexture()
645 { 646 {
646 SendPacket(); 647 SendPacket();
648 counter++;
647 649
648 if ((request.PacketCounter > request.NumPackets) |(request.NumPackets ==1)) 650 if ((request.PacketCounter > request.NumPackets) | (counter >120) |(request.NumPackets ==1))
649 { 651 {
650 return true; 652 return true;
651 } 653 }
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 82ef08d..d56cf6f 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -304,7 +304,7 @@ namespace OpenSim.Region.Capabilities
304 private LLUUID newAssetID; 304 private LLUUID newAssetID;
305 private LLUUID inventoryItemID; 305 private LLUUID inventoryItemID;
306 private BaseHttpServer httpListener; 306 private BaseHttpServer httpListener;
307 private bool SaveAssets = false; 307 private bool SaveAssets = true;
308 private string m_assetName = ""; 308 private string m_assetName = "";
309 309
310 /// <summary> 310 /// <summary>
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index da4e03b..fa323ba 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -187,10 +187,10 @@ namespace OpenSim.Framework.Interfaces
187 void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look); 187 void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look);
188 void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint ); 188 void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint );
189 AgentCircuitData RequestClientInfo(); 189 AgentCircuitData RequestClientInfo();
190 void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint ); 190 void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL );
191 void SendMapBlock(List<MapBlockData> mapBlocks); 191 void SendMapBlock(List<MapBlockData> mapBlocks);
192 void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags); 192 void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags);
193 void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags); 193 void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags, string capsURL);
194 void SendTeleportCancel(); 194 void SendTeleportCancel();
195 void SendTeleportLocationStart(); 195 void SendTeleportLocationStart();
196 void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance); 196 void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance);
diff --git a/OpenSim/Framework/General/NullClientAPI.cs b/OpenSim/Framework/General/NullClientAPI.cs
index bc98cc1..459e12b 100644
--- a/OpenSim/Framework/General/NullClientAPI.cs
+++ b/OpenSim/Framework/General/NullClientAPI.cs
@@ -118,10 +118,10 @@ namespace OpenSim.Framework
118 public virtual void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look){} 118 public virtual void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look){}
119 public virtual void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint){} 119 public virtual void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint){}
120 public virtual AgentCircuitData RequestClientInfo() { return new AgentCircuitData(); } 120 public virtual AgentCircuitData RequestClientInfo() { return new AgentCircuitData(); }
121 public virtual void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint){} 121 public virtual void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL){}
122 public virtual void SendMapBlock(List<MapBlockData> mapBlocks){} 122 public virtual void SendMapBlock(List<MapBlockData> mapBlocks){}
123 public virtual void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags){} 123 public virtual void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags){}
124 public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags){} 124 public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags, string capsURL){}
125 public virtual void SendTeleportCancel(){} 125 public virtual void SendTeleportCancel(){}
126 public virtual void SendTeleportLocationStart(){} 126 public virtual void SendTeleportLocationStart(){}
127 public virtual void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance){} 127 public virtual void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance){}