diff options
| author | Robert Knop <prospero@lindenlab.com> | 2009-05-19 17:16:44 +0000 |
|---|---|---|
| committer | Robert Knop <prospero@lindenlab.com> | 2009-05-19 17:16:44 +0000 |
| commit | 9a8d0699020843ef3e8ee11daac7fd616d752234 (patch) | |
| tree | 9d7790b3da5621d125cdb29c38a1129762cd5dcc /indra/llmessage | |
| parent | 99660542bb5b7d48d95367bae6d5033c1abdf037 (diff) | |
svn merge -r118673:120720 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merging server-1.26 back to trunk.
Two conflicts -- llversionserver.hh (kept the trunk version)
and in llsimparcelmgr.cpp -- also kept the trunk version. There was
some code in 1.26 that included error
printing from RDW that says "we should
really not be hitting this code", and that
code was gone in trunk... so, went ahead
and kept the trunk part of that one
conflict in that file.
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llinstantmessage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/llinstantmessage.cpp b/indra/llmessage/llinstantmessage.cpp index 44be3ae388..3205ddfaeb 100644 --- a/indra/llmessage/llinstantmessage.cpp +++ b/indra/llmessage/llinstantmessage.cpp @@ -357,7 +357,7 @@ LLPointer<LLIMInfo> llsd_to_im_info(const LLSD& im_info_sd) param_message["message"].asString(), param_message["id"].asUUID(), (U32) param_message["parent_estate_id"].asInteger(), - im_info->mRegionID = param_message["region_id"].asUUID(), + param_message["region_id"].asUUID(), ll_vector3_from_sd(param_message["position"]), param_message["data"], (U8) param_message["offline"].asInteger(), |