summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-08-09 10:19:21 -0400
committerOz Linden <oz@lindenlab.com>2011-08-09 10:19:21 -0400
commit4405c74f7120dfd8de8f99c0d933e1f40cd079a9 (patch)
tree754c27fbe28eb239d5adde98f3300a5d7deec610 /indra
parent53efce5b5a430223dba310a77b430fa2c677ad95 (diff)
parent67d3b42d493ae6014646721ff27d51c1873c58c6 (diff)
merge changes for storm-1194
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/skins/default/xui/en/floater_openobject.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_openobject.xml b/indra/newview/skins/default/xui/en/floater_openobject.xml
index 41a440aaa0..f526970ad0 100644
--- a/indra/newview/skins/default/xui/en/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/en/floater_openobject.xml
@@ -22,6 +22,7 @@
layout="topleft"
left="10"
name="object_name"
+ parse_urls="false"
top="20"
width="284">
[DESC]: