summaryrefslogtreecommitdiff
path: root/indra/llmessage/llxfer.cpp
diff options
context:
space:
mode:
authorChristian Goetze <cg@lindenlab.com>2007-08-21 22:17:53 +0000
committerChristian Goetze <cg@lindenlab.com>2007-08-21 22:17:53 +0000
commitce0a5fe14590b8d675b885fccd5f79d7ea17a302 (patch)
tree3388e6f8ff02292ec4521d278c841801462945b8 /indra/llmessage/llxfer.cpp
parentb699ae454d8477d19342d320758cd993d1d28cec (diff)
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
Diffstat (limited to 'indra/llmessage/llxfer.cpp')
-rw-r--r--indra/llmessage/llxfer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llmessage/llxfer.cpp b/indra/llmessage/llxfer.cpp
index 1a1492c20a..441f15365a 100644
--- a/indra/llmessage/llxfer.cpp
+++ b/indra/llmessage/llxfer.cpp
@@ -281,7 +281,7 @@ S32 LLXfer::processEOF()
if (mCallback)
{
- mCallback(mCallbackDataHandle,mCallbackResult);
+ mCallback(mCallbackDataHandle,mCallbackResult,LL_EXSTAT_NONE);
}
return(retval);
@@ -355,3 +355,4 @@ std::ostream& operator<< (std::ostream& os, LLXfer &hh)
+