diff options
author | unknown | 2009-01-10 08:01:42 -0700 |
---|---|---|
committer | unknown | 2009-01-10 08:01:42 -0700 |
commit | 788921aecb5f433ce5000722a12695398360d8ec (patch) | |
tree | 8861b62377938f99100bb5c0da20088f55b99f70 | |
parent | minor gstreamer tweak (diff) | |
download | meta-impy-788921aecb5f433ce5000722a12695398360d8ec.zip meta-impy-788921aecb5f433ce5000722a12695398360d8ec.tar.gz meta-impy-788921aecb5f433ce5000722a12695398360d8ec.tar.bz2 meta-impy-788921aecb5f433ce5000722a12695398360d8ec.tar.xz |
Added 'create landmark' to land pie menu.
-rw-r--r-- | ChangeLog.txt | 8 | ||||
-rw-r--r-- | linden/indra/newview/llviewermenu.cpp | 1 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml | 6 |
3 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index abb55a6..2a8240c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,3 +1,11 @@ | |||
1 | 2009-01-10 Armin <email@unknown.com> | ||
2 | |||
3 | * linden/indra/newview/llviewermenu.cpp: | ||
4 | Added 'create landmark' to land pie menu. | ||
5 | * linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml: | ||
6 | Ditto. | ||
7 | |||
8 | |||
1 | 2008-01-08 McCabe Maxsted <hakushakukun@gmail.com> | 9 | 2008-01-08 McCabe Maxsted <hakushakukun@gmail.com> |
2 | 10 | ||
3 | * linden/indra/cmake/CopyWinLibs.cmake: | 11 | * linden/indra/cmake/CopyWinLibs.cmake: |
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 3bf390e..1994493 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp | |||
@@ -9942,6 +9942,7 @@ void initialize_menus() | |||
9942 | // Land pie menu | 9942 | // Land pie menu |
9943 | addMenu(new LLLandBuild(), "Land.Build"); | 9943 | addMenu(new LLLandBuild(), "Land.Build"); |
9944 | addMenu(new LLLandSit(), "Land.Sit"); | 9944 | addMenu(new LLLandSit(), "Land.Sit"); |
9945 | addMenu(new LLWorldCreateLandmark(),"Land.NewLandmark"); | ||
9945 | addMenu(new LLLandBuyPass(), "Land.BuyPass"); | 9946 | addMenu(new LLLandBuyPass(), "Land.BuyPass"); |
9946 | addMenu(new LLLandEdit(), "Land.Edit"); | 9947 | addMenu(new LLLandEdit(), "Land.Edit"); |
9947 | 9948 | ||
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml index ee2a431..dee0e1d 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml | |||
@@ -3,7 +3,7 @@ | |||
3 | <menu_item_call enabled="false" label="About Land..." mouse_opaque="true" name="About Land..."> | 3 | <menu_item_call enabled="false" label="About Land..." mouse_opaque="true" name="About Land..."> |
4 | <on_click function="ShowFloater" userdata="about land" /> | 4 | <on_click function="ShowFloater" userdata="about land" /> |
5 | </menu_item_call> | 5 | </menu_item_call> |
6 | <menu_item_call enabled="false" label="Create" mouse_opaque="true" name="Create"> | 6 | <menu_item_call enabled="false" label="Build" mouse_opaque="true" name="Create"> |
7 | <on_click function="Land.Build" /> | 7 | <on_click function="Land.Build" /> |
8 | <on_enable function="EnableEdit" /> | 8 | <on_enable function="EnableEdit" /> |
9 | </menu_item_call> | 9 | </menu_item_call> |
@@ -13,7 +13,9 @@ | |||
13 | <menu_item_call enabled="false" label="Sit Here" mouse_opaque="true" name="Sit Here"> | 13 | <menu_item_call enabled="false" label="Sit Here" mouse_opaque="true" name="Sit Here"> |
14 | <on_click function="Land.Sit" /> | 14 | <on_click function="Land.Sit" /> |
15 | </menu_item_call> | 15 | </menu_item_call> |
16 | <menu_item_separator /> | 16 | <menu_item_call enabled="false" label="Create Landmark" mouse_opaque="true" name="Add Landmark"> |
17 | <on_click function="Land.NewLandmark" /> | ||
18 | </menu_item_call> | ||
17 | <menu_item_call enabled="false" label="Buy Pass..." mouse_opaque="true" name="Land Buy Pass"> | 19 | <menu_item_call enabled="false" label="Buy Pass..." mouse_opaque="true" name="Land Buy Pass"> |
18 | <on_click function="Land.BuyPass" /> | 20 | <on_click function="Land.BuyPass" /> |
19 | <on_enable function="Land.EnableBuyPass" /> | 21 | <on_enable function="Land.EnableBuyPass" /> |