From 5aa56b12743c19a68cb371609be797e5fb3e2c4b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 28 Jul 2010 18:55:29 +0100
Subject: Fix problem where changes to media textures for prims duplicated by
 shify copy would change both prims until server restart

I also found out that you can crash the current viewer by giving it more media entrys than it's expecting
---
 .../Region/CoreModules/World/Media/Moap/MoapModule.cs  | 18 +++++++++---------
 .../CoreModules/World/Permissions/PermissionsModule.cs | 12 ++++++------
 2 files changed, 15 insertions(+), 15 deletions(-)

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

diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
index d53f573..6d74b8e 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
@@ -350,9 +350,9 @@ namespace OpenSim.Region.CoreModules.Media.Moap
             
             if (null == part)
             {
-//                m_log.WarnFormat(
-//                    "[MOAP]: Received a GET ObjectMediaRequest for prim {0} but this doesn't exist in region {1}", 
-//                    primId, m_scene.RegionInfo.RegionName);
+                m_log.WarnFormat(
+                    "[MOAP]: Received a GET ObjectMediaRequest for prim {0} but this doesn't exist in region {1}", 
+                    primId, m_scene.RegionInfo.RegionName);
                 return string.Empty;
             }
             
@@ -386,9 +386,9 @@ namespace OpenSim.Region.CoreModules.Media.Moap
             
             if (null == part)
             {
-//                m_log.WarnFormat(
-//                    "[MOAP]: Received an UPDATE ObjectMediaRequest for prim {0} but this doesn't exist in region {1}", 
-//                    primId, m_scene.RegionInfo.RegionName);
+                m_log.WarnFormat(
+                    "[MOAP]: Received an UPDATE ObjectMediaRequest for prim {0} but this doesn't exist in region {1}", 
+                    primId, m_scene.RegionInfo.RegionName);
                 return string.Empty;
             }                                    
             
@@ -403,9 +403,9 @@ namespace OpenSim.Region.CoreModules.Media.Moap
             
             if (omu.FaceMedia.Length > part.GetNumberOfSides())
             {
-//                m_log.WarnFormat(
-//                    "[MOAP]: Received {0} media entries from client for prim {1} {2} but this prim has only {3} faces.  Dropping request.", 
-//                    omu.FaceMedia.Length, part.Name, part.UUID, part.GetNumberOfSides());
+                m_log.WarnFormat(
+                    "[MOAP]: Received {0} media entries from client for prim {1} {2} but this prim has only {3} faces.  Dropping request.", 
+                    omu.FaceMedia.Length, part.Name, part.UUID, part.GetNumberOfSides());
                 return string.Empty;
             }
             
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 982ac52..3a642f4 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -1923,9 +1923,9 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             if (null == me)
                 return true;
             
-            m_log.DebugFormat(
-                "[PERMISSIONS]: Checking CanControlPrimMedia for {0} on {1} face {2} with control permissions {3}", 
-                agentID, primID, face, me.ControlPermissions);
+//            m_log.DebugFormat(
+//                "[PERMISSIONS]: Checking CanControlPrimMedia for {0} on {1} face {2} with control permissions {3}", 
+//                agentID, primID, face, me.ControlPermissions);
             
             return GenericPrimMediaPermission(part, agentID, me.ControlPermissions);
         }  
@@ -1949,9 +1949,9 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             if (null == me)
                 return true;
             
-            m_log.DebugFormat(
-                "[PERMISSIONS]: Checking CanInteractWithPrimMedia for {0} on {1} face {2} with interact permissions {3}", 
-                agentID, primID, face, me.InteractPermissions);            
+//            m_log.DebugFormat(
+//                "[PERMISSIONS]: Checking CanInteractWithPrimMedia for {0} on {1} face {2} with interact permissions {3}", 
+//                agentID, primID, face, me.InteractPermissions);            
             
             return GenericPrimMediaPermission(part, agentID, me.InteractPermissions);
         }          
-- 
cgit v1.1