diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
| commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
| tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/newview/llviewerparcelmedia.cpp | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/llviewerparcelmedia.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmedia.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp index 12523f487b..de37ce253e 100644 --- a/indra/newview/llviewerparcelmedia.cpp +++ b/indra/newview/llviewerparcelmedia.cpp @@ -282,7 +282,7 @@ void LLViewerParcelMedia::processParcelMediaCommandMessage( LLMessageSystem *msg } else { - LLParcel *parcel = gParcelMgr->getAgentParcel(); + LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel(); play(parcel); } } @@ -308,7 +308,7 @@ void LLViewerParcelMedia::processParcelMediaCommandMessage( LLMessageSystem *msg { if(! LLViewerMedia::hasMedia()) { - LLParcel *parcel = gParcelMgr->getAgentParcel(); + LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel(); play(parcel); } seek(time); @@ -343,7 +343,7 @@ void LLViewerParcelMedia::processParcelMediaUpdate( LLMessageSystem *msg, void * msg->getS32("DataBlockExtended", "MediaHeight", media_height); } - LLParcel *parcel = gParcelMgr->getAgentParcel(); + LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel(); BOOL same = FALSE; if (parcel) { |