Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminster

Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
2026-08-05 08:55:56 +08:00 · 2012-11-20 01:20:59 +00:00
parent 9f2d232c71 619c39e514
commit ccc81183b0
4 changed files with 547 additions and 79 deletions
--- 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(