Merge branch 'land-tools' into next-merge

1 files changed, 33 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 66a13d2..361fe54 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -6,6 +6,25 @@
         * linden/indra/newview/skins/default/xui/en-us/floater_tools.xml:
         Changed "Select Texture" to "Select Faces to Texture".
 
+2008-09-22  Aimee Trescothick  <aimee@ama-zing.co.uk>
+
+        * linden/indra/newview/app_settings/settings.xml:
+        VWR-8430: Usability improvements to the land tools floater.
+        * linden/indra/newview/llfloatertools.cpp:
+        Ditto.
+        * linden/indra/newview/llfloatertools.h:
+        Ditto.
+        * linden/indra/newview/llpanelland.cpp:
+        Ditto.
+        * linden/indra/newview/llpanelland.h:
+        Ditto.
+        * linden/indra/newview/lltoolbrush.cpp:
+        Ditto.
+        * linden/indra/newview/skins/default/xui/en-us/alerts.xml:
+        Ditto.
+        * linden/indra/newview/skins/default/xui/en-us/floater_tools.xml:
+        Ditto.
+
 2008-09-21  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml:
@@ -24,6 +43,20 @@
         * linden/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml:
         Ditto.
 
+2008-09-19  Gigs Taggart  <gigstaggart@gmail.com>
+
+        * linden/indra/newview/app_settings/settings.xml:
+        VWR-2331: Terraform tool variable "strength".
+        Contributing authors: Gigs Taggart, Aimee Trescothick, Which Linden.
+        * linden/indra/newview/llfloatertools.cpp:
+        Ditto.
+        * linden/indra/newview/llfloatertools.h:
+        Ditto.
+        * linden/indra/newview/lltoolbrush.cpp:
+        Ditto.
+        * linden/indra/newview/skins/default/xui/en-us/floater_tools.xml:
+        Ditto.
+
 2008-09-19  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml: