summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-02-01 16:39:27 -0800
committerRichard Linden <none@none>2012-02-01 16:39:27 -0800
commitd32c1c28b4e2add4e51361d13356b6638c6f0817 (patch)
treed7dae448675e7ac313244460eb76a109f940e893 /indra/llmessage
parent5a14a67e060e7f325025e924c83489cfa236e3dc (diff)
cleaned up linden_common.h, removing stuff that is mostly unused
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/llbufferstream.cpp4
-rw-r--r--indra/llmessage/llxfer.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/llmessage/llbufferstream.cpp b/indra/llmessage/llbufferstream.cpp
index bb65d16670..6257983c43 100644
--- a/indra/llmessage/llbufferstream.cpp
+++ b/indra/llmessage/llbufferstream.cpp
@@ -273,7 +273,7 @@ streampos LLBufferStreamBuf::seekoff(
// NULL is fine
break;
}
- address = (S32)mBuffer->seek(mChannels.in(), base_addr, off);
+ address = mBuffer->seek(mChannels.in(), base_addr, off);
if(address)
{
LLBufferArray::segment_iterator_t iter;
@@ -304,7 +304,7 @@ streampos LLBufferStreamBuf::seekoff(
// NULL is fine
break;
}
- address = (S32)mBuffer->seek(mChannels.out(), base_addr, off);
+ address = mBuffer->seek(mChannels.out(), base_addr, off);
if(address)
{
LLBufferArray::segment_iterator_t iter;
diff --git a/indra/llmessage/llxfer.h b/indra/llmessage/llxfer.h
index 989e8b2cab..f9348eb11f 100644
--- a/indra/llmessage/llxfer.h
+++ b/indra/llmessage/llxfer.h
@@ -29,6 +29,7 @@
#include "message.h"
#include "lltimer.h"
+#include "llextendedstatus.h"
const S32 LL_XFER_LARGE_PAYLOAD = 7680;