summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerparcelmedia.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-06-06 22:43:38 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-06-06 22:43:38 +0000
commitad332810078a0bbb8fa08fcbfdf3d756de6914f6 (patch)
tree1608b2db5d620d323673607ea7ddadfba9d58bda /indra/newview/llviewerparcelmedia.cpp
parenta7d9a543e587ffe84b355db7a2e8193bfe6c68b6 (diff)
QAR-650 - Viewer RC 9 merge -> release (post cmake)
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
Diffstat (limited to 'indra/newview/llviewerparcelmedia.cpp')
-rw-r--r--indra/newview/llviewerparcelmedia.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp
index 0259d4896c..ba6a6005bf 100644
--- a/indra/newview/llviewerparcelmedia.cpp
+++ b/indra/newview/llviewerparcelmedia.cpp
@@ -100,15 +100,17 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
// we have a player
if (parcel)
{
- // we're in a parcel
- bool new_parcel = false;
- S32 parcelid = parcel->getLocalID();
-
if(!gAgent.getRegion())
{
- llerrs << "gAgent's region is NULL." << llendl ;
+ sMediaRegionID = LLUUID() ;
+ stop() ;
+ return ;
}
+ // we're in a parcel
+ bool new_parcel = false;
+ S32 parcelid = parcel->getLocalID();
+
LLUUID regionid = gAgent.getRegion()->getRegionID();
if (parcelid != sMediaParcelLocalID || regionid != sMediaRegionID)
{