diff options
| author | McCabe Maxsted | 2009-01-12 10:54:25 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-01-12 10:54:25 -0700 |
| commit | 263319bae6cc197fee412b8b1a64d0b6a06b0c21 (patch) | |
| tree | d43a89bfbefe57ba24cb5bf5e92586a6ee826e64 /ChangeLog.txt | |
| parent | Added 'create landmark' to land pie menu (diff) | |
| parent | Backported 'report abuse' avatar pie menu option. (diff) | |
| download | meta-impy-263319bae6cc197fee412b8b1a64d0b6a06b0c21.zip meta-impy-263319bae6cc197fee412b8b1a64d0b6a06b0c21.tar.gz meta-impy-263319bae6cc197fee412b8b1a64d0b6a06b0c21.tar.bz2 meta-impy-263319bae6cc197fee412b8b1a64d0b6a06b0c21.tar.xz | |
Backported 'report abuse' avatar pie menu option
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 16879e0..9b6d8a9 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | <<<<<<< HEAD:ChangeLog.txt | ||
| 1 | 2009-01-12 McCabe Maxsted <hakushakukun@gmail.com> | 2 | 2009-01-12 McCabe Maxsted <hakushakukun@gmail.com> |
| 2 | 3 | ||
| 3 | * linden/indra/llcommon/llversionviewer.h | 4 | * linden/indra/llcommon/llversionviewer.h |
| @@ -75,6 +76,13 @@ | |||
| 75 | * linden/indra/newview/llviewermenu.cpp: | 76 | * linden/indra/newview/llviewermenu.cpp: |
| 76 | Added 'create landmark' to land pie menu. | 77 | Added 'create landmark' to land pie menu. |
| 77 | * linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml: | 78 | * linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml: |
| 79 | ======= | ||
| 80 | 2009-01-10 McCabe Maxsted <hakushakukun@gmail.com> | ||
| 81 | |||
| 82 | * linden/indra/newview/llviewermenu.cpp: | ||
| 83 | Backported 'report abuse' avatar pie menu option. | ||
| 84 | * linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml: | ||
| 85 | >>>>>>> pieavreportabuse:ChangeLog.txt | ||
| 78 | Ditto. | 86 | Ditto. |
| 79 | 87 | ||
| 80 | 88 | ||