diff options
author | McCabe Maxsted | 2009-10-10 09:57:27 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-10-10 09:57:27 -0700 |
commit | a460abeaf0dc8d96bb8399d31ce3c11b439afefb (patch) | |
tree | c26c4cf84a8647d2572ede155ffd7e7c7239da3d /ChangeLog.txt | |
parent | Added and tweaked vertical IM option from Emerald viewer (diff) | |
parent | Disable camera constraints now disables max zoom for the scrollwheel (diff) | |
download | meta-impy-a460abeaf0dc8d96bb8399d31ce3c11b439afefb.zip meta-impy-a460abeaf0dc8d96bb8399d31ce3c11b439afefb.tar.gz meta-impy-a460abeaf0dc8d96bb8399d31ce3c11b439afefb.tar.bz2 meta-impy-a460abeaf0dc8d96bb8399d31ce3c11b439afefb.tar.xz |
Merge branch '1.2.0-cameraconstraints' into 1.2.0-cameraconstraints2
Diffstat (limited to 'ChangeLog.txt')
-rw-r--r-- | ChangeLog.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 09ce463..4e267a9 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -171,6 +171,11 @@ modified: linden/indra/newview/skins/default/xui/en-us/notify.xml | |||
171 | 171 | ||
172 | 2009-10-03 McCabe Maxsted <hakushakukun@gmail.com> | 172 | 2009-10-03 McCabe Maxsted <hakushakukun@gmail.com> |
173 | 173 | ||
174 | * Disable camera constraints now disables max zoom for the scrollwheel. | ||
175 | |||
176 | modified: linden/indra/newview/llagent.cpp | ||
177 | |||
178 | |||
174 | * Fixed layout of debug permissions in tools window. | 179 | * Fixed layout of debug permissions in tools window. |
175 | 180 | ||
176 | modified: linden/indra/newview/skins/default/xui/en-us/floater_tools.xml | 181 | modified: linden/indra/newview/skins/default/xui/en-us/floater_tools.xml |