aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Media
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-07-28 18:55:29 +0100
committerJustin Clark-Casey (justincc)2010-07-28 18:55:29 +0100
commit5aa56b12743c19a68cb371609be797e5fb3e2c4b (patch)
tree4b9b23b0e4de1397e16eaa6cd03baa8edfedd7b3 /OpenSim/Region/CoreModules/World/Media
parentcomment out further debug line in BaseHttpServer (diff)
downloadopensim-SC_OLD-5aa56b12743c19a68cb371609be797e5fb3e2c4b.zip
opensim-SC_OLD-5aa56b12743c19a68cb371609be797e5fb3e2c4b.tar.gz
opensim-SC_OLD-5aa56b12743c19a68cb371609be797e5fb3e2c4b.tar.bz2
opensim-SC_OLD-5aa56b12743c19a68cb371609be797e5fb3e2c4b.tar.xz
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
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Media')
-rw-r--r--OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs18
1 files changed, 9 insertions, 9 deletions
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
350 350
351 if (null == part) 351 if (null == part)
352 { 352 {
353// m_log.WarnFormat( 353 m_log.WarnFormat(
354// "[MOAP]: Received a GET ObjectMediaRequest for prim {0} but this doesn't exist in region {1}", 354 "[MOAP]: Received a GET ObjectMediaRequest for prim {0} but this doesn't exist in region {1}",
355// primId, m_scene.RegionInfo.RegionName); 355 primId, m_scene.RegionInfo.RegionName);
356 return string.Empty; 356 return string.Empty;
357 } 357 }
358 358
@@ -386,9 +386,9 @@ namespace OpenSim.Region.CoreModules.Media.Moap
386 386
387 if (null == part) 387 if (null == part)
388 { 388 {
389// m_log.WarnFormat( 389 m_log.WarnFormat(
390// "[MOAP]: Received an UPDATE ObjectMediaRequest for prim {0} but this doesn't exist in region {1}", 390 "[MOAP]: Received an UPDATE ObjectMediaRequest for prim {0} but this doesn't exist in region {1}",
391// primId, m_scene.RegionInfo.RegionName); 391 primId, m_scene.RegionInfo.RegionName);
392 return string.Empty; 392 return string.Empty;
393 } 393 }
394 394
@@ -403,9 +403,9 @@ namespace OpenSim.Region.CoreModules.Media.Moap
403 403
404 if (omu.FaceMedia.Length > part.GetNumberOfSides()) 404 if (omu.FaceMedia.Length > part.GetNumberOfSides())
405 { 405 {
406// m_log.WarnFormat( 406 m_log.WarnFormat(
407// "[MOAP]: Received {0} media entries from client for prim {1} {2} but this prim has only {3} faces. Dropping request.", 407 "[MOAP]: Received {0} media entries from client for prim {1} {2} but this prim has only {3} faces. Dropping request.",
408// omu.FaceMedia.Length, part.Name, part.UUID, part.GetNumberOfSides()); 408 omu.FaceMedia.Length, part.Name, part.UUID, part.GetNumberOfSides());
409 return string.Empty; 409 return string.Empty;
410 } 410 }
411 411