diff options
| author | Jacek Antonelli | 2008-09-21 17:10:05 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-09-21 17:10:05 -0500 |
| commit | 0e0d99012554e06f5e3b96772cf5561418c99a9a (patch) | |
| tree | b55149478e947cd2c8b3d3016c08b0eed336a773 /ChangeLog.txt | |
| parent | Merge branch 'VWR-8056-b' into menu_viewer (diff) | |
| parent | VWR-2948: Create XUI-based Advanced menu. (diff) | |
| download | meta-impy-0e0d99012554e06f5e3b96772cf5561418c99a9a.zip meta-impy-0e0d99012554e06f5e3b96772cf5561418c99a9a.tar.gz meta-impy-0e0d99012554e06f5e3b96772cf5561418c99a9a.tar.bz2 meta-impy-0e0d99012554e06f5e3b96772cf5561418c99a9a.tar.xz | |
Merge branch 'VWR-2896' into menu_viewer
Conflicts:
linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
Diffstat (limited to 'ChangeLog.txt')
| -rw-r--r-- | ChangeLog.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index adb3efc..7dd2814 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
| @@ -1,5 +1,13 @@ | |||
| 1 | 2008-09-19 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2008-09-19 Jacek Antonelli <jacek.antonelli@gmail.com> |
| 2 | 2 | ||
| 3 | * linden/indra/newview/llviewermenu.cpp: | ||
| 4 | VWR-2947: Create event callbacks for Advanced menu functions. | ||
| 5 | Part of VWR-2896: Convert "Advanced" menu to XUI. | ||
| 6 | |||
| 7 | * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml: | ||
| 8 | VWR-2948: Create XUI-based Advanced menu. | ||
| 9 | Part of VWR-2896: Convert "Advanced" menu to XUI. | ||
| 10 | |||
| 3 | * linden/indra/SConstruct: | 11 | * linden/indra/SConstruct: |
| 4 | New optional SConstruct flag to specify an exact path to build | 12 | New optional SConstruct flag to specify an exact path to build |
| 5 | directory: BUILD_DIR. For convenience until we switch to CMake. | 13 | directory: BUILD_DIR. For convenience until we switch to CMake. |