aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerregion.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewerregion.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewerregion.h b/linden/indra/newview/llviewerregion.h
index 76b9aaf..69a8f19 100644
--- a/linden/indra/newview/llviewerregion.h
+++ b/linden/indra/newview/llviewerregion.h
@@ -162,7 +162,7 @@ public:
162 static U8 stringToAccess(const char* access_str); 162 static U8 stringToAccess(const char* access_str);
163 163
164 // Returns "M", "PG", etc. 164 // Returns "M", "PG", etc.
165 static const char* accessToShortString(U8 access); 165 static const char* accessToShortString(U8 access); /* Flawfinder: ignore */
166 166
167 // helper function which just makes sure all interested parties 167 // helper function which just makes sure all interested parties
168 // can process the message. 168 // can process the message.
@@ -172,7 +172,7 @@ public:
172 172
173 F32 getWidth() const { return mWidth; } 173 F32 getWidth() const { return mWidth; }
174 174
175 BOOL idleUpdate(LLTimer &timer, const F32 max_time); 175 BOOL idleUpdate(F32 max_update_time);
176 176
177 // Like idleUpdate, but forces everything to complete regardless of 177 // Like idleUpdate, but forces everything to complete regardless of
178 // how long it takes. 178 // how long it takes.
@@ -188,6 +188,7 @@ public:
188 void setSeedCapability(const std::string& url); 188 void setSeedCapability(const std::string& url);
189 void setCapability(const std::string& name, const std::string& url); 189 void setCapability(const std::string& name, const std::string& url);
190 std::string getCapability(const std::string& name) const; 190 std::string getCapability(const std::string& name) const;
191 void logActiveCapabilities() const;
191 192
192 const LLHost &getHost() const { return mHost; } 193 const LLHost &getHost() const { return mHost; }
193 const U64 &getHandle() const { return mHandle; } 194 const U64 &getHandle() const { return mHandle; }