diff options
| author | Jacek Antonelli | 2008-09-28 13:56:00 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-09-28 19:55:41 -0500 |
| commit | 9a4f5702473e7540cde1bbff2d7189d9ed71fd86 (patch) | |
| tree | 53d52a965085be43c89ef45592a8198f7befc4be /linden/indra/newview/lloverlaybar.h | |
| parent | Second Life viewer sources 1.21.2-RC (diff) | |
| parent | Merge branch 'VWR-8341' into next-merge (diff) | |
| download | meta-impy-9a4f5702473e7540cde1bbff2d7189d9ed71fd86.zip meta-impy-9a4f5702473e7540cde1bbff2d7189d9ed71fd86.tar.gz meta-impy-9a4f5702473e7540cde1bbff2d7189d9ed71fd86.tar.bz2 meta-impy-9a4f5702473e7540cde1bbff2d7189d9ed71fd86.tar.xz | |
Updated to SL source 1.21.2.
Conflicts:
linden/indra/SConstruct
linden/indra/newview/files.lst
linden/indra/newview/llfloatertools.cpp
linden/indra/newview/llfloatertools.h
linden/indra/newview/lloverlaybar.cpp
linden/indra/newview/lloverlaybar.h
linden/indra/newview/llviewermenu.cpp
linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
linden/indra/newview/viewer_manifest.py
Diffstat (limited to 'linden/indra/newview/lloverlaybar.h')
| -rw-r--r-- | linden/indra/newview/lloverlaybar.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/lloverlaybar.h b/linden/indra/newview/lloverlaybar.h index 907441e..5880ff0 100644 --- a/linden/indra/newview/lloverlaybar.h +++ b/linden/indra/newview/lloverlaybar.h | |||
| @@ -68,6 +68,7 @@ public: | |||
| 68 | 68 | ||
| 69 | static void onClickIMReceived(void* data); | 69 | static void onClickIMReceived(void* data); |
| 70 | static void onClickSetNotBusy(void* data); | 70 | static void onClickSetNotBusy(void* data); |
| 71 | static void onClickFlycam(void* data); | ||
| 71 | static void onClickMouselook(void* data); | 72 | static void onClickMouselook(void* data); |
| 72 | static void onClickStandUp(void* data); | 73 | static void onClickStandUp(void* data); |
| 73 | static void onClickResetView(void* data); | 74 | static void onClickResetView(void* data); |