livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

meow-7.2.2
Tofu Linden 2010-08-09 14:14:16 +01:00
parent 3a79e9bc22 c70b05082f
commit b22b042edd
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llpanellandmarks.cpp
View File

@ -522,6 +522,9 @@ void LLLandmarksPanel::setParcelID(const LLUUID& parcel_id)
{
if (!parcel_id.isNull())
{
//ext-4655, defensive. remove now incase this gets called twice without a remove
LLRemoteParcelInfoProcessor::getInstance()->removeObserver(parcel_id, this);
LLRemoteParcelInfoProcessor::getInstance()->addObserver(parcel_id, this);
LLRemoteParcelInfoProcessor::getInstance()->sendParcelInfoRequest(parcel_id);
}

3
indra/newview/llpanelpick.cpp
View File

@ -210,6 +210,9 @@ void LLPanelPickInfo::sendParcelInfoRequest()
{
if (mParcelId != mRequestedId)
{
//ext-4655, remove now incase this gets called twice without a remove
LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mRequestedId, this);
LLRemoteParcelInfoProcessor::getInstance()->addObserver(mParcelId, this);
LLRemoteParcelInfoProcessor::getInstance()->sendParcelInfoRequest(mParcelId);

3
indra/newview/llpanelplace.cpp
View File

@ -202,6 +202,9 @@ void LLPanelPlace::sendParcelInfoRequest()
{
if (mParcelID != mRequestedID)
{
//ext-4655, remove now incase this gets called twice without a remove
LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mRequestedID, this);
LLRemoteParcelInfoProcessor::getInstance()->addObserver(mParcelID, this);
LLRemoteParcelInfoProcessor::getInstance()->sendParcelInfoRequest(mParcelID);

4
indra/newview/llpanelplaceinfo.cpp
View File

@ -133,6 +133,10 @@ void LLPanelPlaceInfo::sendParcelInfoRequest()
{
if (mParcelID != mRequestedID)
{
//ext-4655, defensive. remove now incase this gets called twice without a remove
//as panel never closes its ok atm (but wrong :)
LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mRequestedID, this);
LLRemoteParcelInfoProcessor::getInstance()->addObserver(mParcelID, this);
LLRemoteParcelInfoProcessor::getInstance()->sendParcelInfoRequest(mParcelID);