Replace hg.secondlife.com with bitbucket.org/lindenlab/viewer-release

Incorporate viewer channel and version into doxygen output
Use the autobuild configuration as a variant to build doxygen docs.
Upload doxygen docs as a tarball if generated.

3 files changed, 6 insertions, 6 deletions

diff --git a/indra/Doxyfile.in b/indra/Doxyfile.in
index 1a20eebf22..db31000b2d 100644
--- a/indra/Doxyfile.in
+++ b/indra/Doxyfile.in
@@ -25,13 +25,13 @@ DOXYFILE_ENCODING      = UTF-8
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = SecondLifeViewer
+PROJECT_NAME           = "@VIEWER_CHANNEL@"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         =
+PROJECT_NUMBER         = @VIEWER_SHORT_VERSION@.@VIEWER_VERSION_REVISION@
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index b23978a534..6a246e32e5 100755
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -1,12 +1,12 @@
 /** 
- * @mainpage Second Life Viewer
+ * @mainpage
  *
  * This is the sources for the Second Life Viewer;
  * information on the open source project is at 
  * https://wiki.secondlife.com/wiki/Open_Source_Portal
  *
  * The Mercurial repository for the trunk version is at
- * https://hg.secondlife.com/viewer-development
+ * https://bitbucket.org/lindenlab/viewer-release
  *
  * @section source-license Source License
  * @verbinclude LICENSE-source.txt
diff --git a/indra/newview/llwindowlistener.cpp b/indra/newview/llwindowlistener.cpp
index 734018cfc2..5367262bb6 100755
--- a/indra/newview/llwindowlistener.cpp
+++ b/indra/newview/llwindowlistener.cpp
@@ -55,7 +55,7 @@ LLWindowListener::LLWindowListener(LLViewerWindow *window, const KeyboardGetter&
 		"Given [\"keysym\"], [\"keycode\"] or [\"char\"], inject the specified ";
 	std::string keyExplain =
 		"(integer keycode values, or keysym string from any addKeyName() call in\n"
-		"http://hg.secondlife.com/viewer-development/src/tip/indra/llwindow/llkeyboard.cpp )\n";
+		"http://bitbucket.org/lindenlab/viewer-release/src/tip/indra/llwindow/llkeyboard.cpp )\n";
 	std::string mask =
 		"Specify optional [\"mask\"] as an array containing any of \"CTL\", \"ALT\",\n"
 		"\"SHIFT\" or \"MAC_CONTROL\"; the corresponding modifier bits will be combined\n"
@@ -70,7 +70,7 @@ LLWindowListener::LLWindowListener(LLViewerWindow *window, const KeyboardGetter&
 		"(button values \"LEFT\", \"MIDDLE\", \"RIGHT\")\n";
 	std::string paramsExplain =
 		"[\"path\"] is as for LLUI::resolvePath(), described in\n"
-		"http://hg.secondlife.com/viewer-development/src/tip/indra/llui/llui.h\n"
+		"http://bitbucket.org/lindenlab/viewer-release/src/tip/indra/llui/llui.h\n"
 		"If you omit [\"path\"], you must specify both [\"x\"] and [\"y\"].\n"
 		"If you specify [\"path\"] without both [\"x\"] and [\"y\"], will synthesize (x, y)\n"
 		"in the center of the LLView selected by [\"path\"].\n"