diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index ee96140c6e..1d0bf8de46 100755
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -487,7 +487,10 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
 			}
 		}
 	}
-	if (retval & (MEDIA_URL_REMOVED | MEDIA_URL_ADDED | MEDIA_URL_UPDATED | MEDIA_FLAGS_CHANGED)) 
+// <FS:CR> OpenSim returns a zero. Don't request MediaData where MOAP isn't supported
+	//if (retval & (MEDIA_URL_REMOVED | MEDIA_URL_ADDED | MEDIA_URL_UPDATED | MEDIA_FLAGS_CHANGED))
+	if (retval != 0 && retval & (MEDIA_URL_REMOVED | MEDIA_URL_ADDED | MEDIA_URL_UPDATED | MEDIA_FLAGS_CHANGED))
+// </FS:CR>
 	{
 		// If only the media URL changed, and it isn't a media version URL,
 		// ignore it