summaryrefslogtreecommitdiff
path: root/scripts/messages
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-04-04 10:42:52 -0400
committerLoren Shih <seraph@lindenlab.com>2011-04-04 10:42:52 -0400
commit47781184fc50f6e9e0842c2d7fa7632038a279df (patch)
tree83522faadf17895565c38d89064aff6da51a1006 /scripts/messages
parent0dd0758ab9114c53a274ff707d626c8fe5e7afb0 (diff)
parent3c6a09372da395a621fb35db4934af2c7c21e910 (diff)
Automated merge up from viewer-development into mesh-development
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 dde0f5bcfa..2cb0a833d4 100644
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -2975,7 +2975,7 @@ version 2.0
{ BillableFactor F32 }
{ ObjectBonusFactor F32 }
{ WaterHeight F32 }
- { TerrainRaiseLimit F32 }
+ { TerrainRaiseLimit F32 }
{ TerrainLowerLimit F32 }
{ PricePerMeter S32 }
{ RedirectGridX S32 }
@@ -4251,6 +4251,10 @@ version 2.0
Buttons Variable
{ ButtonLabel Variable 1 }
}
+ {
+ OwnerData Variable
+ { OwnerID LLUUID }
+ }
}
@@ -6771,6 +6775,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..41e70011af
--- /dev/null
+++ b/scripts/messages/message_template.msg.sha1
@@ -0,0 +1 @@
+ce3be58f4ea395c272fcfa3e6b6dad027c188e0d \ No newline at end of file