summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2011-12-14 11:48:39 -0800
committerTodd Stinson <stinson@lindenlab.com>2011-12-14 11:48:39 -0800
commit4f5fc4921ff35cc12568eebc36e0318efbd34068 (patch)
tree8e7b0af50668c979940e83aff46d535a20ead8f4
parentdbc68b2c16ed2db2e2622359e74bcd7e5cba5234 (diff)
Updating to the correct new llpathinglibrary pre-built package.
-rw-r--r--autobuild.xml8
-rw-r--r--indra/newview/skins/default/xui/en/floater_pathfinding_console.xml15
2 files changed, 19 insertions, 4 deletions
diff --git a/autobuild.xml b/autobuild.xml
index e9641efc72..7786f4abb7 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1798,9 +1798,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>728e281fd74d505dc2d34796904c2fc9</string>
+ <string>534c5217692bef44a60a3cf26ccb08d9</string>
<key>url</key>
- <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/246757/arch/CYGWIN/installer/llpathinglibrary-0.1-windows-20111214.tar.bz2</string>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-havok-source_Windows-vs2010/rev/245961/arch/CYGWIN/installer/havok_source-2011.2-windows-20111130.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -1822,9 +1822,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>ce6c326d37c99a10a13a4de806205466</string>
+ <string>728e281fd74d505dc2d34796904c2fc9</string>
<key>url</key>
- <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/246580/arch/CYGWIN/installer/llpathinglibrary-0.1-windows-20111212.tar.bz2</string>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/246757/arch/CYGWIN/installer/llpathinglibrary-0.1-windows-20111214.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 1b8eda4328..f0fea1e52b 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -9,4 +9,19 @@
save_rect="true"
title="Pathfinding"
width="490">
+ <text
+ height="30"
+ word_wrap="true"
+ use_ellipses="true"
+ type="string"
+ text_color="LabelSelectedDisabledColor"
+ length="1"
+ follows="left|top"
+ layout="topleft"
+ left="8"
+ name="text status"
+ top_pad="3"
+ width="285">
+ Show overlays:
+ </text>
</floater>