Making sure my local working copy is in sync with svn before I start the job of enabling the new SceneObject classes.

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
                 lock (this.SendingTextures)
                 {
                     this.SendingTextures.Remove(sender.request.ImageInfo.FullID);
-                    this.AvatarRecievedTextures[sender.request.RequestUser.AgentId].Add(sender.request.ImageInfo.FullID);
+                   // this.AvatarRecievedTextures[sender.request.RequestUser.AgentId].Add(sender.request.ImageInfo.FullID);
                 }
             }
         }
@@ -634,7 +634,8 @@ namespace OpenSim.Framework.Communications.Caches
         public class TextureSender
         {
             public AssetRequest request;
-          
+            private int counter = 0;
+
             public TextureSender(AssetRequest req)
             {
                 request = req;
@@ -644,8 +645,9 @@ namespace OpenSim.Framework.Communications.Caches
             public bool SendTexture()
             {
                 SendPacket();
+                counter++;
               
-                if ((request.PacketCounter > request.NumPackets) |(request.NumPackets ==1))
+                if ((request.PacketCounter > request.NumPackets) | (counter >120) |(request.NumPackets ==1))
                 {
                     return true;
                 }
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
             private LLUUID newAssetID;
             private LLUUID inventoryItemID;
             private BaseHttpServer httpListener;
-            private bool SaveAssets = false;
+            private bool SaveAssets = true;
             private string m_assetName = "";
 
             /// <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
         void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look);
         void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint );
         AgentCircuitData RequestClientInfo();
-        void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint );
+        void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL );
         void SendMapBlock(List<MapBlockData> mapBlocks);
         void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags);
-        void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags);
+        void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags, string capsURL);
         void SendTeleportCancel();
         void SendTeleportLocationStart();
         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
        public virtual void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look){}
        public virtual void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint){}
        public virtual AgentCircuitData RequestClientInfo() { return new AgentCircuitData(); }
-       public virtual void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint){}
+       public virtual void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL){}
        public virtual void SendMapBlock(List<MapBlockData> mapBlocks){}
        public virtual void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags){}
-       public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags){}
+       public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags, string capsURL){}
        public virtual void SendTeleportCancel(){}
        public virtual void SendTeleportLocationStart(){}
        public virtual void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance){}