aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon
diff options
context:
space:
mode:
authorJacek Antonelli2008-12-12 16:36:26 -0600
committerJacek Antonelli2008-12-12 16:36:26 -0600
commit1462183301ff94727fdc27201e5476d55b3d566e (patch)
treeccc2837f659be52cb2b9f538b8accfa2c835d5a3 /linden/indra/llcommon
parentFixed indentation for 'skins' prefix. (diff)
parentIndentation cleanup. (llviewernetwork.cpp) (diff)
downloadmeta-impy-1462183301ff94727fdc27201e5476d55b3d566e.zip
meta-impy-1462183301ff94727fdc27201e5476d55b3d566e.tar.gz
meta-impy-1462183301ff94727fdc27201e5476d55b3d566e.tar.bz2
meta-impy-1462183301ff94727fdc27201e5476d55b3d566e.tar.xz
Merge branch 'next' into doc
Diffstat (limited to 'linden/indra/llcommon')
-rw-r--r--linden/indra/llcommon/llsecondlifeurls.cpp2
-rw-r--r--linden/indra/llcommon/llversionviewer.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/llcommon/llsecondlifeurls.cpp b/linden/indra/llcommon/llsecondlifeurls.cpp
index ee478fe..b006a6a 100644
--- a/linden/indra/llcommon/llsecondlifeurls.cpp
+++ b/linden/indra/llcommon/llsecondlifeurls.cpp
@@ -84,4 +84,4 @@ const std::string SL_KB_URL (
84 "http://secondlife.com/knowledgebase/"); 84 "http://secondlife.com/knowledgebase/");
85 85
86const std::string RELEASE_NOTES_BASE_URL ( 86const std::string RELEASE_NOTES_BASE_URL (
87 "http://secondlife.com/app/releasenotes/"); 87 "http://imprudenceviewer.org/wiki/Release_Notes/");
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index bc42359..cddc654 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -45,5 +45,6 @@ const char * const IMP_VIEWER_NAME = "Imprudence";
45const S32 IMP_VERSION_MAJOR = 1; 45const S32 IMP_VERSION_MAJOR = 1;
46const S32 IMP_VERSION_MINOR = 0; 46const S32 IMP_VERSION_MINOR = 0;
47const S32 IMP_VERSION_PATCH = 0; 47const S32 IMP_VERSION_PATCH = 0;
48const char * const IMP_VERSION_TEST = "RC2";
48 49
49#endif 50#endif