diff options
| author | Ramzi Linden <ramzi@lindenlab.com> | 2010-01-19 16:18:23 -0800 |
|---|---|---|
| committer | Ramzi Linden <ramzi@lindenlab.com> | 2010-01-19 16:18:23 -0800 |
| commit | 992cabd7f99c27052eca00f53b177e3cb4d3dd17 (patch) | |
| tree | 57d0fdfef0116b5874048c67544b26cca40a34a9 | |
| parent | 4e4561cb32f5cdb3224e011c3e086c14d6ad97a2 (diff) | |
| parent | 9f163b9f4577a78cd2c4e37c791834d98f1485c4 (diff) | |
merge
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerhelputil.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 68f376fe11..69336243da 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3607,7 +3607,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://viewer-help.secondlife.com/[LANGUAGE]/[CHANNEL]/[VERSION]/[TOPIC]/[DEBUG_MODE]</string> + <string>http://viewer-help.secondlife.com/[LANGUAGE]/[CHANNEL]/[VERSION]/[TOPIC][DEBUG_MODE]</string> </map> <key>HomeSidePanelURL</key> <map> diff --git a/indra/newview/llviewerhelputil.cpp b/indra/newview/llviewerhelputil.cpp index ffc5761372..967a2925e3 100644 --- a/indra/newview/llviewerhelputil.cpp +++ b/indra/newview/llviewerhelputil.cpp @@ -64,7 +64,7 @@ std::string LLViewerHelpUtil::buildHelpURL( const std::string &topic) { LLSD substitution; substitution["TOPIC"] = helpURLEncode(topic); - substitution["DEBUG_MODE"] = gAgent.isGodlike() ? "debug" : ""; + substitution["DEBUG_MODE"] = gAgent.isGodlike() ? "/debug" : ""; // get the help URL and expand all of the substitutions // (also adds things like [LANGUAGE], [VERSION], [OS], etc.) |