summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2009-12-10 22:38:29 +0000
committerLynx Linden <lynx@lindenlab.com>2009-12-10 22:38:29 +0000
commitb3f8cec38c15fecaf39b7b187aa46e8df9df8eff (patch)
tree27e920ddbada369711d93d681b9771fd77f17cc2 /indra/newview/llviewermenu.cpp
parentd575af6a6545708d05e06a1e8614a84ca5cab458 (diff)
DEV-43977: Changed pre-login help browser behavior.
The special pre_login_help topic is now only displayed when the user clicks on the "Need help logging in?" link on the login screen, or selects the top-level Help > Second Life Help (F1) menu.
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r--indra/newview/llviewermenu.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 9def699708..36d9e7935f 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -5575,17 +5575,8 @@ class LLShowHelp : public view_listener_t
bool handleEvent(const LLSD& userdata)
{
std::string help_topic = userdata.asString();
-
LLViewerHelp* vhelp = LLViewerHelp::getInstance();
- if (help_topic.empty())
- {
- vhelp->showTopic(vhelp->getTopicFromFocus());
- }
- else
- {
- vhelp->showTopic(help_topic);
- }
-
+ vhelp->showTopic(help_topic);
return true;
}
};