aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerparcelmedia.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:42 -0500
committerJacek Antonelli2008-08-15 23:45:42 -0500
commitce28e056c20bf2723f565bbf464b87781ec248a2 (patch)
treeef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/newview/llviewerparcelmedia.cpp
parentSecond Life viewer sources 1.19.1.4b (diff)
downloadmeta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz
Second Life viewer sources 1.20.2
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewerparcelmedia.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp
index 9180fb2..187a553 100644
--- a/linden/indra/newview/llviewerparcelmedia.cpp
+++ b/linden/indra/newview/llviewerparcelmedia.cpp
@@ -295,7 +295,7 @@ void LLViewerParcelMedia::processParcelMediaCommandMessage( LLMessageSystem *msg
295 } 295 }
296 else 296 else
297 { 297 {
298 LLParcel *parcel = gParcelMgr->getAgentParcel(); 298 LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
299 play(parcel); 299 play(parcel);
300 } 300 }
301 } 301 }
@@ -311,7 +311,7 @@ void LLViewerParcelMedia::processParcelMediaCommandMessage( LLMessageSystem *msg
311 { 311 {
312 if(! LLViewerMedia::hasMedia()) 312 if(! LLViewerMedia::hasMedia())
313 { 313 {
314 LLParcel *parcel = gParcelMgr->getAgentParcel(); 314 LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
315 play(parcel); 315 play(parcel);
316 } 316 }
317 seek(time); 317 seek(time);
@@ -346,7 +346,7 @@ void LLViewerParcelMedia::processParcelMediaUpdate( LLMessageSystem *msg, void *
346 msg->getS32("DataBlockExtended", "MediaHeight", media_height); 346 msg->getS32("DataBlockExtended", "MediaHeight", media_height);
347 } 347 }
348 348
349 LLParcel *parcel = gParcelMgr->getAgentParcel(); 349 LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
350 BOOL same = FALSE; 350 BOOL same = FALSE;
351 if (parcel) 351 if (parcel)
352 { 352 {