diff options
| author | Kyle Machulis <qdot@lindenlab.com> | 2007-11-20 23:42:48 +0000 |
|---|---|---|
| committer | Kyle Machulis <qdot@lindenlab.com> | 2007-11-20 23:42:48 +0000 |
| commit | 2e7c0d973ed28d732ea19762099ed3c55123780e (patch) | |
| tree | 36b04301d325e07075880a8a64166c5284d1d61f /indra/llmessage/llcircuit.h | |
| parent | 5356b917545d43df5537128245ee5b786b705b90 (diff) | |
svn merge -r74104:74124 svn+ssh://svn/svn/linden/branches/crash-logger-cleanup-merge-6
Diffstat (limited to 'indra/llmessage/llcircuit.h')
| -rw-r--r-- | indra/llmessage/llcircuit.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llmessage/llcircuit.h b/indra/llmessage/llcircuit.h index 128b1bc222..1a6611f5d4 100644 --- a/indra/llmessage/llcircuit.h +++ b/indra/llmessage/llcircuit.h @@ -75,6 +75,7 @@ const S32 LL_MAX_ACKED_PACKETS_PER_FRAME = 200; // class LLMessageSystem; class LLEncodedDatagramService; +class LLSD; // // Classes @@ -158,7 +159,7 @@ public: // void checkPeriodTime(); // Reset per-period counters if necessary. friend std::ostream& operator<<(std::ostream& s, LLCircuitData &circuit); - const LLString getInfoString() const; + void getInfo(LLSD& info) const; friend class LLCircuit; friend class LLMessageSystem; @@ -304,7 +305,7 @@ public: void sendAcks(); friend std::ostream& operator<<(std::ostream& s, LLCircuit &circuit); - const LLString getInfoString() const; + void getInfo(LLSD& info) const; void dumpResends(); |