diff options
| author | Robert Knop <prospero@lindenlab.com> | 2009-01-19 22:05:19 +0000 |
|---|---|---|
| committer | Robert Knop <prospero@lindenlab.com> | 2009-01-19 22:05:19 +0000 |
| commit | ce888706c5589bbd30423cd1cbfb7b168b16d680 (patch) | |
| tree | 9869898ee1d915bfc6faec72a5c9f5198702f2df /indra/llmessage/llpacketring.h | |
| parent | f1380f2fc3eecd8dfd2f75d053ff86716d5055f7 (diff) | |
svn merge -r108236:108243 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
Still merging from server-1.25... one day I will catch up!
No conflicts
Diffstat (limited to 'indra/llmessage/llpacketring.h')
| -rw-r--r-- | indra/llmessage/llpacketring.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llmessage/llpacketring.h b/indra/llmessage/llpacketring.h index a1bac5bc70..4408abeb5f 100644 --- a/indra/llmessage/llpacketring.h +++ b/indra/llmessage/llpacketring.h @@ -62,6 +62,7 @@ public: BOOL sendPacket(int h_socket, char * send_buffer, S32 buf_size, LLHost host); inline LLHost getLastSender(); + inline LLHost getLastReceivingInterface(); S32 getAndResetActualInBits() { S32 bits = mActualBitsIn; mActualBitsIn = 0; return bits;} S32 getAndResetActualOutBits() { S32 bits = mActualBitsOut; mActualBitsOut = 0; return bits;} @@ -86,6 +87,7 @@ protected: std::queue<LLPacketBuffer *> mSendQueue; LLHost mLastSender; + LLHost mLastReceivingIF; }; @@ -94,4 +96,9 @@ inline LLHost LLPacketRing::getLastSender() return mLastSender; } +inline LLHost LLPacketRing::getLastReceivingInterface() +{ + return mLastReceivingIF; +} + #endif |