From ee6cd884c9732b492675e043fe318ffcdfecc45d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 13 Jul 2010 23:58:19 +0100
Subject: implement serverside checks for media texture navigation in order to
 stop naughty clients

---
 .../CoreModules/World/Media/Moap/MoapModule.cs       | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/CoreModules/World/Media/Moap')

diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
index d7aede9..09786ec 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
@@ -245,12 +245,12 @@ namespace OpenSim.Region.CoreModules.Media.Moap
             
             m_log.DebugFormat("[MOAP]: Received {0} media entries for prim {1}", omu.FaceMedia.Length, primId);                        
                        
-            for (int i = 0; i < omu.FaceMedia.Length; i++)
-            {
-                MediaEntry me = omu.FaceMedia[i];
-                string v = (null == me ? "null": OSDParser.SerializeLLSDXmlString(me.GetOSD()));
-                m_log.DebugFormat("[MOAP]: Face {0} [{1}]", i, v);
-            }
+//            for (int i = 0; i < omu.FaceMedia.Length; i++)
+//            {
+//                MediaEntry me = omu.FaceMedia[i];
+//                string v = (null == me ? "null": OSDParser.SerializeLLSDXmlString(me.GetOSD()));
+//                m_log.DebugFormat("[MOAP]: Face {0} [{1}]", i, v);
+//            }
             
             if (omu.FaceMedia.Length > part.GetNumberOfSides())
             {
@@ -322,6 +322,14 @@ namespace OpenSim.Region.CoreModules.Media.Moap
                 return string.Empty;
             }  
             
+            UUID agentId = default(UUID);
+            
+            lock (m_omuCapUsers)
+                agentId = m_omuCapUsers[path];         
+            
+            if (!m_scene.Permissions.CanInteractWithPrimMedia(agentId, part.UUID, omn.Face))
+                return string.Empty;
+            
             m_log.DebugFormat(
                 "[MOAP]: Updating media entry for face {0} on prim {1} {2} to {3}", 
                 omn.Face, part.Name, part.UUID, omn.URL);
-- 
cgit v1.1