diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-10 19:17:38 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-10 19:17:38 -0700 |
| commit | ec23ec68ea8835e4155e083ec5570245b0aef1ec (patch) | |
| tree | 157ff142523382a6756ebc508a98362891a850e7 /indra/llui | |
| parent | 7e13856df2c60a7e011df01459a3a085a3a4a82a (diff) | |
EXP-1310 FIX Profile button should open Web Profile floater
removed unused LLWeb functions for opening non-web media
moved logic inside floaters and away from auxiliary functions
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfloaterreg.cpp | 6 | ||||
| -rw-r--r-- | indra/llui/llhelp.h | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp index d0ae9413a3..ae06eb74ac 100644 --- a/indra/llui/llfloaterreg.cpp +++ b/indra/llui/llfloaterreg.cpp @@ -110,7 +110,11 @@ LLFloater* LLFloaterReg::getInstance(const std::string& name, const LLSD& key) int index = list.size(); res = build_func(key); - + if (!res) + { + llwarns << "Failed to build floater type: '" << name << "'." << llendl; + return NULL; + } bool success = res->buildFromFile(xui_file, NULL); if (!success) { diff --git a/indra/llui/llhelp.h b/indra/llui/llhelp.h index 83317bd03c..1726347a78 100644 --- a/indra/llui/llhelp.h +++ b/indra/llui/llhelp.h @@ -32,6 +32,7 @@ class LLHelp { public: virtual void showTopic(const std::string &topic) = 0; + virtual std::string getURL(const std::string &topic) = 0; // return default (fallback) topic name suitable for showTopic() virtual std::string defaultTopic() = 0; // return topic to use before the user logs in |