diff options
author | Monroe Linden <monroe@lindenlab.com> | 2009-11-13 14:48:24 -0800 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2009-11-13 14:48:24 -0800 |
commit | 6cb4b27897462582428e9d469feb6bf8c9335b06 (patch) | |
tree | 5864fd09334addf5b103a07857f81fda45ad12e1 /indra | |
parent | 21357c482256be27780ebf46749b5ccad1c96a9d (diff) |
Fix for DEV-42161 (LLViewerMediaImpl::navigateInternal spam when editing object properties).
Made LLPanelMediaSettingsGeneral::updateMediaPreview() only do a navigate when the URL actually changes.
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llpanelmediasettingsgeneral.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llpanelmediasettingsgeneral.cpp b/indra/newview/llpanelmediasettingsgeneral.cpp index 2cf56d5571..ad8a379cc1 100644 --- a/indra/newview/llpanelmediasettingsgeneral.cpp +++ b/indra/newview/llpanelmediasettingsgeneral.cpp @@ -322,13 +322,19 @@ void LLPanelMediaSettingsGeneral::updateMediaPreview() { if ( mHomeURL->getValue().asString().length() > 0 ) { - mPreviewMedia->navigateTo( mHomeURL->getValue().asString() ); + if(mPreviewMedia->getCurrentNavUrl() != mHomeURL->getValue().asString()) + { + mPreviewMedia->navigateTo( mHomeURL->getValue().asString() ); + } } else // new home URL will be empty if media is deleted so display a // "preview goes here" data url page { - mPreviewMedia->navigateTo( CHECKERBOARD_DATA_URL ); + if(mPreviewMedia->getCurrentNavUrl() != CHECKERBOARD_DATA_URL) + { + mPreviewMedia->navigateTo( CHECKERBOARD_DATA_URL ); + } }; } |