summaryrefslogtreecommitdiff
path: root/scripts/messages
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-01 09:31:56 -0400
committerOz Linden <oz@lindenlab.com>2011-04-01 09:31:56 -0400
commit9698314736252b248921bb3a3459f2bdf539ffba (patch)
treecff4957f66ae90248466a0dccd6e5886dfb62f55 /scripts/messages
parented2222be5d33cb4216e6826507ae1d06e9781253 (diff)
parent2c584790d0505ebff13d29e9f068aefcffe54f01 (diff)
merge changes for storm-399
Diffstat (limited to 'scripts/messages')
-rw-r--r--scripts/messages/message_template.msg8
-rw-r--r--scripts/messages/message_template.msg.sha11
2 files changed, 8 insertions, 1 deletions
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 77dc940335..d292653d3f 100644
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -2966,7 +2966,7 @@ version 2.0
{ BillableFactor F32 }
{ ObjectBonusFactor F32 }
{ WaterHeight F32 }
- { TerrainRaiseLimit F32 }
+ { TerrainRaiseLimit F32 }
{ TerrainLowerLimit F32 }
{ PricePerMeter S32 }
{ RedirectGridX S32 }
@@ -4242,6 +4242,10 @@ version 2.0
Buttons Variable
{ ButtonLabel Variable 1 }
}
+ {
+ OwnerData Variable
+ { OwnerID LLUUID }
+ }
}
@@ -6762,6 +6766,8 @@ version 2.0
}
// And, the money transfer
+// *NOTE: Unused as of 2010-04-06, because all back-end money transactions
+// are done with web services via L$ API. JC
{
MoneyTransferBackend Low 312 Trusted Zerocoded
{
diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1
new file mode 100644
index 0000000000..4b1ba7e2d3
--- /dev/null
+++ b/scripts/messages/message_template.msg.sha1
@@ -0,0 +1 @@
+ee062c94248e9af06df5284f7186893a135084c9 \ No newline at end of file