diff options
| author | callum <none@none> | 2010-12-16 15:40:02 -0800 |
|---|---|---|
| committer | callum <none@none> | 2010-12-16 15:40:02 -0800 |
| commit | 836bbd8395ec5ec450cee326cdffcb7e7ed0532e (patch) | |
| tree | cac701f486336b621db6a799649c066ba6be2b43 /indra/newview | |
| parent | 51e53849f0dd7f8ce8439e833d6d99a59c0f2ee0 (diff) | |
SOCIAL-370 FIX (2) Links to External Web Pages not working in Floaters such as Search in Webkit 4.7 branch
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llmediactrl.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index 5834d0503b..92fb578e81 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -1109,14 +1109,15 @@ void LLMediaCtrl::onPopup(const LLSD& notification, const LLSD& response) lldebugs << "No gFloaterView for onPopuup()" << llendl; }; - // open the same kind of floater as parent if possible - if ( floater_name == "media_browser" ) + // (for now) open web content floater if that's our parent, otherwise, open the current media floater + // (this will change soon) + if ( floater_name == "web_content" ) { - LLWeb::loadURL(notification["payload"]["url"], notification["payload"]["target"], notification["payload"]["uuid"]); + LLWeb::loadWebURL(notification["payload"]["url"], notification["payload"]["target"], notification["payload"]["uuid"]); } else { - LLWeb::loadWebURL(notification["payload"]["url"], notification["payload"]["target"], notification["payload"]["uuid"]); + LLWeb::loadURL(notification["payload"]["url"], notification["payload"]["target"], notification["payload"]["uuid"]); } } else |