diff options
author | Jacek Antonelli | 2008-08-15 23:44:56 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:56 -0500 |
commit | c07901e29ed545bbb02e3bddf148fe1104b94e9f (patch) | |
tree | f1ada64ce834acd7d92a425efb96c4b86bcf16b1 /linden/indra/llmessage/llcircuit.h | |
parent | Second Life viewer sources 1.15.0.2 (diff) | |
download | meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.zip meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.gz meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.bz2 meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.xz |
Second Life viewer sources 1.15.1.3
Diffstat (limited to 'linden/indra/llmessage/llcircuit.h')
-rw-r--r-- | linden/indra/llmessage/llcircuit.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/llmessage/llcircuit.h b/linden/indra/llmessage/llcircuit.h index e3a5779..1eea203 100644 --- a/linden/indra/llmessage/llcircuit.h +++ b/linden/indra/llmessage/llcircuit.h | |||
@@ -151,7 +151,7 @@ public: | |||
151 | // | 151 | // |
152 | void checkPeriodTime(); // Reset per-period counters if necessary. | 152 | void checkPeriodTime(); // Reset per-period counters if necessary. |
153 | friend std::ostream& operator<<(std::ostream& s, LLCircuitData &circuit); | 153 | friend std::ostream& operator<<(std::ostream& s, LLCircuitData &circuit); |
154 | const char* getInfoString() const; | 154 | const LLString getInfoString() const; |
155 | 155 | ||
156 | friend class LLCircuit; | 156 | friend class LLCircuit; |
157 | friend class LLMessageSystem; | 157 | friend class LLMessageSystem; |
@@ -297,7 +297,7 @@ public: | |||
297 | void sendAcks(); | 297 | void sendAcks(); |
298 | 298 | ||
299 | friend std::ostream& operator<<(std::ostream& s, LLCircuit &circuit); | 299 | friend std::ostream& operator<<(std::ostream& s, LLCircuit &circuit); |
300 | const char* getInfoString() const; | 300 | const LLString getInfoString() const; |
301 | 301 | ||
302 | void dumpResends(); | 302 | void dumpResends(); |
303 | 303 | ||