From 836bbd8395ec5ec450cee326cdffcb7e7ed0532e Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Thu, 16 Dec 2010 15:40:02 -0800
Subject: [PATCH] SOCIAL-370 FIX (2) Links to External Web Pages not working in
Floaters such as Search in Webkit 4.7 branch
---
indra/newview/llmediactrl.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp
index 5834d0503be..92fb578e819 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
--
GitLab