From 9a8d0699020843ef3e8ee11daac7fd616d752234 Mon Sep 17 00:00:00 2001
From: Robert Knop <prospero@lindenlab.com>
Date: Tue, 19 May 2009 17:16:44 +0000
Subject: 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.
---
indra/llmessage/llinstantmessage.cpp | 2 +-
scripts/messages/message_template.msg | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
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(),
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index f7230cfdf6..23efd65c45 100644
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -4911,6 +4911,12 @@ version 2.0
{ ActualArea S32 }
{ Final BOOL } // true if buyer should be in tier
}
+ {
+ RegionData Single // included so region name shows up in transaction logs
+ { RegionID LLUUID }
+ { GridX U32 }
+ { GridY U32 }
+ }
}
// sim ->dataserver
--
cgit v1.2.3