summaryrefslogtreecommitdiff
path: root/indra/newview/llviewernetwork.h
diff options
context:
space:
mode:
authorBaker Linden <baker@lindenlab.com>2013-09-30 17:27:25 -0700
committerBaker Linden <baker@lindenlab.com>2013-09-30 17:27:25 -0700
commitce526d40638fcc78724913621ee5c12f792f1859 (patch)
tree735e03596926582d70d1609754d4e91fd6f49b77 /indra/newview/llviewernetwork.h
parent34f561db55868185f0a946009f41f4f212366484 (diff)
parentad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff)
Merge with voorhees (viewer-release)
Diffstat (limited to 'indra/newview/llviewernetwork.h')
-rwxr-xr-xindra/newview/llviewernetwork.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llviewernetwork.h b/indra/newview/llviewernetwork.h
index 3f56103b2e..8526c0ba7f 100755
--- a/indra/newview/llviewernetwork.h
+++ b/indra/newview/llviewernetwork.h
@@ -140,6 +140,14 @@ class LLGridManager : public LLSingleton<LLGridManager>
*/
//@}
+ /* ================================================================
+ * @name Update Related Properties
+ * @{
+ */
+ /// Get the update service URL base (host and path) for the selected grid
+ std::string getUpdateServiceURL();
+
+ //@}
/* ================================================================
* @name URL Construction Properties
@@ -207,6 +215,7 @@ class LLGridManager : public LLSingleton<LLGridManager>
const std::string& login,
const std::string& helper,
const std::string& login_page,
+ const std::string& update_url_base,
const std::string& login_id = "");