diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewerparcelmedia.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp index 386a86e..a9ea1e6 100644 --- a/linden/indra/newview/llviewerparcelmedia.cpp +++ b/linden/indra/newview/llviewerparcelmedia.cpp | |||
@@ -101,12 +101,11 @@ void LLViewerParcelMedia::update(LLParcel* parcel) | |||
101 | sMediaRegionID = LLUUID() ; | 101 | sMediaRegionID = LLUUID() ; |
102 | stop() ; | 102 | stop() ; |
103 | LL_DEBUGS("Media") << "no agent region, bailing out." << LL_ENDL; | 103 | LL_DEBUGS("Media") << "no agent region, bailing out." << LL_ENDL; |
104 | return ; | 104 | return ; |
105 | } | 105 | } |
106 | 106 | ||
107 | // we're in a parcel | 107 | // we're in a parcel |
108 | bool new_parcel = false; | 108 | S32 parcelid = parcel->getLocalID(); |
109 | S32 parcelid = parcel->getLocalID(); | ||
110 | 109 | ||
111 | LLUUID regionid = gAgent.getRegion()->getRegionID(); | 110 | LLUUID regionid = gAgent.getRegion()->getRegionID(); |
112 | if (parcelid != sMediaParcelLocalID || regionid != sMediaRegionID) | 111 | if (parcelid != sMediaParcelLocalID || regionid != sMediaRegionID) |
@@ -114,7 +113,6 @@ void LLViewerParcelMedia::update(LLParcel* parcel) | |||
114 | LL_DEBUGS("Media") << "New parcel, parcel id = " << parcelid << ", region id = " << regionid << LL_ENDL; | 113 | LL_DEBUGS("Media") << "New parcel, parcel id = " << parcelid << ", region id = " << regionid << LL_ENDL; |
115 | sMediaParcelLocalID = parcelid; | 114 | sMediaParcelLocalID = parcelid; |
116 | sMediaRegionID = regionid; | 115 | sMediaRegionID = regionid; |
117 | new_parcel = true; | ||
118 | } | 116 | } |
119 | 117 | ||
120 | std::string mediaUrl = std::string ( parcel->getMediaURL () ); | 118 | std::string mediaUrl = std::string ( parcel->getMediaURL () ); |