diff options
author | McCabe Maxsted | 2010-08-11 05:57:33 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-08-26 11:19:26 -0700 |
commit | 54607d12837acac1b88cc3602e041362340796f8 (patch) | |
tree | b814b112af2e7ab6b0333a8002b377fd31f11e31 /linden/indra/newview/hippoGridManager.h | |
parent | Applied patch by Altair Memo for VWR-19947: Nvidia gpu_table.txt updated (diff) | |
download | meta-impy-54607d12837acac1b88cc3602e041362340796f8.zip meta-impy-54607d12837acac1b88cc3602e041362340796f8.tar.gz meta-impy-54607d12837acac1b88cc3602e041362340796f8.tar.bz2 meta-impy-54607d12837acac1b88cc3602e041362340796f8.tar.xz |
Re-enabled search url fetching in the grid manager and fixed up web search to support them (fetched urls are equivalent to SearchURLDefault and searches follow the SL web search formatting)
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/hippoGridManager.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/hippoGridManager.h b/linden/indra/newview/hippoGridManager.h index 5ad6ca2..bc19ff8 100644 --- a/linden/indra/newview/hippoGridManager.h +++ b/linden/indra/newview/hippoGridManager.h | |||
@@ -47,6 +47,7 @@ public: | |||
47 | const std::string& getSupportUrl() const; | 47 | const std::string& getSupportUrl() const; |
48 | const std::string& getRegisterUrl() const; | 48 | const std::string& getRegisterUrl() const; |
49 | const std::string& getPasswordUrl() const; | 49 | const std::string& getPasswordUrl() const; |
50 | // Returns the url base used for the Web Search tab | ||
50 | const std::string& getSearchUrl() const; | 51 | const std::string& getSearchUrl() const; |
51 | const std::string& getFirstName() const; | 52 | const std::string& getFirstName() const; |
52 | const std::string& getLastName() const; | 53 | const std::string& getLastName() const; |
@@ -72,6 +73,7 @@ public: | |||
72 | void setSupportUrl(const std::string& url); | 73 | void setSupportUrl(const std::string& url); |
73 | void setRegisterUrl(const std::string& url); | 74 | void setRegisterUrl(const std::string& url); |
74 | void setPasswordUrl(const std::string& url); | 75 | void setPasswordUrl(const std::string& url); |
76 | // sets the url base used for the Web Search tab | ||
75 | void setSearchUrl(const std::string& url); | 77 | void setSearchUrl(const std::string& url); |
76 | void setRenderCompat(bool compat); | 78 | void setRenderCompat(bool compat); |
77 | void setMaxAgentGroups(int max) { mMaxAgentGroups = max; } | 79 | void setMaxAgentGroups(int max) { mMaxAgentGroups = max; } |