Merge branch 'teravuswork' into avination

2 files changed, 4 insertions, 1 deletions

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index e31c7f6..6559638 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1135,6 +1135,8 @@ namespace OpenSim.Framework
 
         void SetChildAgentThrottle(byte[] throttle);
 
+        void SetAgentThrottleSilent(int throttle, int setting);
+
         void SendAvatarDataImmediate(ISceneEntity avatar);
 
         /// <summary>
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index d0a37d0..c19ac32 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -53,7 +53,8 @@ namespace OpenSim.Framework.Servers.HttpServer
             Normal = 0,
             LslHttp = 1,
             Inventory = 2,
-            Texture = 3
+            Texture = 3, 
+            Mesh = 4
         }
 
         public PollServiceEventArgs(