summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorsimon <none@none>2013-07-02 16:05:44 -0700
committersimon <none@none>2013-07-02 16:05:44 -0700
commitd75ae6b4f43ffb82bd5db6b6b59ae3d9b8b7e989 (patch)
treee43e9236e077356a3fd7185f9fe8a954d69f7de8 /indra/newview/skins/default/xui
parentf41c8f53412b3ca8500e72d9cde8e70ca0bc266e (diff)
parent0b763695bb6f5d0ddce830bd1fa77ab1a653560f (diff)
Merge
Diffstat (limited to 'indra/newview/skins/default/xui')
-rwxr-xr-xindra/newview/skins/default/xui/en/strings.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index ef01f27da2..fb1846860c 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -646,11 +646,11 @@ Returns the wind velocity at the object position + offset
</string>
<string name="LSLTipText_llSetStatus" translate="false">
llSetStatus(integer status, integer value)
-Sets status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z) to value
+Sets status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_BLOCK_GRAB_OBJECT, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z) to value
</string>
<string name="LSLTipText_llGetStatus" translate="false">
integer llGetStatus(integer status)
-Returns value of status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z)
+Returns the boolean value of status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_BLOCK_GRAB_OBJECT, STATUS_ROTATE_X, STATUS_ROTATE_Y, or STATUS_ROTATE_Z)
</string>
<string name="LSLTipText_llSetScale" translate="false">
llSetScale(vector scale)