summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-02-23 16:42:50 -0800
committerRichard Linden <none@none>2011-02-23 16:42:50 -0800
commit73dda9419055a3ab37e0310032e65c780d0fb8b3 (patch)
treecc5dc8fdeab0fc710bb9ec11b772a3abd0aac199 /indra/newview
parentf3238a700eb387dc87d75c2ee0032ecad9e29b54 (diff)
SOCIAL-551 WIP Add buttons to open people and profile windows
add URL accessor for web content floaters
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloaterwebcontent.cpp5
-rw-r--r--indra/newview/llfloaterwebcontent.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp
index 058567492b..bcbb01ab1d 100644
--- a/indra/newview/llfloaterwebcontent.cpp
+++ b/indra/newview/llfloaterwebcontent.cpp
@@ -400,3 +400,8 @@ void LLFloaterWebContent::onPopExternal()
LLWeb::loadURLExternal( url );
};
}
+
+std::string LLFloaterWebContent::getURL() const
+{
+ return mAddressCombo->getValue().asString();
+}
diff --git a/indra/newview/llfloaterwebcontent.h b/indra/newview/llfloaterwebcontent.h
index ecc7e970d8..6c934158d0 100644
--- a/indra/newview/llfloaterwebcontent.h
+++ b/indra/newview/llfloaterwebcontent.h
@@ -65,6 +65,7 @@ public:
void onClickStop();
void onEnterAddress();
void onPopExternal();
+ std::string getURL() const;
private:
void open_media(const std::string& media_url, const std::string& target);