3 files changed, 32 insertions, 16 deletions

diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 8db1e15..2cedea0 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -89,6 +89,7 @@ namespace OpenSim.Framework.Interfaces
 
     public delegate void UDPAssetUploadRequest(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data);
     public delegate void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data);
+    public delegate void RequestXfer(IClientAPI remoteClient, ulong xferID, string fileName);
 
     public interface IClientAPI
     {
@@ -140,6 +141,7 @@ namespace OpenSim.Framework.Interfaces
         event RequestTaskInventory OnRequestTaskInventory;
         event UDPAssetUploadRequest OnAssetUploadRequest;
         event XferReceive OnXferReceive;
+        event RequestXfer OnRequestXfer;
 
         event UUIDNameRequest OnNameFromUUIDRequest;
 
@@ -212,11 +214,17 @@ namespace OpenSim.Framework.Interfaces
         void SendInventoryItemUpdate(InventoryItemBase Item);
         void SendRemoveInventoryItem(LLUUID itemID);
         void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName);
+        void SendXferPacket(ulong xferID, uint packet, byte[] data);
+
+        void SendPreLoadSound(LLUUID objectID, LLUUID ownerID, LLUUID soundID);
+        void SendPlayAttachedSound(LLUUID soundID, LLUUID objectID, LLUUID ownerID, float gain, byte flags);
 
         void SendNameReply(LLUUID profileId, string firstname, string lastname);
         void SendAlertMessage(string message);
         void SendAgentAlertMessage(string message, bool modal);
         void SendLoadURL(string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, string url);
         bool AddMoney( int debit );
+
+        void SendViewerTime(int phase);
     }
 }
diff --git a/OpenSim/Framework/General/NullClientAPI.cs b/OpenSim/Framework/General/NullClientAPI.cs
index 6be2563..e001549 100644
--- a/OpenSim/Framework/General/NullClientAPI.cs
+++ b/OpenSim/Framework/General/NullClientAPI.cs
@@ -59,6 +59,7 @@ namespace OpenSim.Framework
        public event RequestTaskInventory OnRequestTaskInventory;
        public event UDPAssetUploadRequest OnAssetUploadRequest;
        public event XferReceive OnXferReceive;
+       public event RequestXfer OnRequestXfer;
 
        public event UUIDNameRequest OnNameFromUUIDRequest;
 
@@ -140,6 +141,10 @@ namespace OpenSim.Framework
        public virtual void SendInventoryItemUpdate(InventoryItemBase Item) { }
        public virtual void SendRemoveInventoryItem(LLUUID itemID) { }
        public virtual void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName) { }
+       public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data) { }
+
+       public virtual void SendPreLoadSound(LLUUID objectID, LLUUID ownerID, LLUUID soundID) { }
+       public virtual void SendPlayAttachedSound(LLUUID soundID, LLUUID objectID, LLUUID ownerID, float gain, byte flags) { }
 
        public virtual void SendNameReply(LLUUID profileId, string firstname, string lastname){}
        public void SendAlertMessage(string message) { }
@@ -151,6 +156,8 @@ namespace OpenSim.Framework
        {
             return false;
        }
+
+       public void SendViewerTime(int phase) { }
    }
 }
 
diff --git a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
index 87cf173..728767f 100644
--- a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
@@ -12,12 +12,12 @@ namespace OpenSim.Framework.Types
         RightTriangle = 4,
         HalfCircle = 5
     }
-    
+
     public enum HollowShape : byte
     {
         Same = 0,
         Circle = 16,
-            Square =32,
+        Square = 32,
         Triangle = 48
     }
 
@@ -26,7 +26,7 @@ namespace OpenSim.Framework.Types
         Primitive = 9,
         Avatar = 47
     }
-    
+
     public enum Extrusion : byte
     {
         Straight = 16,
@@ -34,11 +34,11 @@ namespace OpenSim.Framework.Types
         Curve2 = 48,
         Flexible = 128
     }
-    
+
     public class PrimitiveBaseShape
     {
         private static byte[] m_defaultTextureEntry;
-        
+
         public byte PCode;
         public ushort PathBegin;
         public ushort PathEnd;
@@ -100,14 +100,14 @@ namespace OpenSim.Framework.Types
         {
             m_defaultTextureEntry = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005")).ToBytes();
         }
-        
+
         public PrimitiveBaseShape()
         {
             PCode = (byte)PCodeEnum.Primitive;
             ExtraParams = new byte[1];
             TextureEntry = m_defaultTextureEntry;
         }
-        
+
         //void returns need to change of course
         public virtual void GetMesh()
         {
@@ -121,11 +121,12 @@ namespace OpenSim.Framework.Types
     }
 
     public class GenericShape : PrimitiveBaseShape
-    {        
-        public GenericShape() : base()
+    {
+        public GenericShape()
+            : base()
         {
-            
-        }                       
+
+        }
     }
 
     public class BoxShape : PrimitiveBaseShape
@@ -133,7 +134,7 @@ namespace OpenSim.Framework.Types
         public BoxShape()
             : base()
         {
-            PathCurve = (byte) Extrusion.Straight;
+            PathCurve = (byte)Extrusion.Straight;
             ProfileShape = ProfileShape.Square;
             PathScaleX = 100;
             PathScaleY = 100;
@@ -156,8 +157,8 @@ namespace OpenSim.Framework.Types
             {
                 BoxShape boxShape = new BoxShape();
 
-                boxShape.SetSide( 0.5f );
-                
+                boxShape.SetSide(0.5f);
+
                 return boxShape;
             }
         }
@@ -182,12 +183,12 @@ namespace OpenSim.Framework.Types
 
         private void SetHeigth(float heigth)
         {
-            Scale.Z = heigth;            
+            Scale.Z = heigth;
         }
 
         private void SetRadius(float radius)
         {
-            Scale.X = Scale.Y = radius*2f;
+            Scale.X = Scale.Y = radius * 2f;
         }
     }
 }