diff options
| author | Jacek Antonelli | 2009-09-09 11:38:26 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-09 11:59:42 -0500 |
| commit | ced5a5f6a0e7d294f9e477409387674fcecc532c (patch) | |
| tree | e7500de0806009c2955bef6af7103ac60ae1e8e0 /linden/indra/newview/llpanelpermissions.h | |
| parent | Merge branch 'objectbackup' into next (diff) | |
| parent | Commented out permissions button (todo: backport this if there's time) (diff) | |
| download | meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.zip meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.tar.gz meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.tar.bz2 meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.tar.xz | |
Merge remote branch 'mccabe/1.2.0-next' into next
Moved "Backup" pie menu item to fit "Go Here" in top-left slot.
Conflicts:
linden/indra/newview/llviewermenu.cpp
linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
Diffstat (limited to 'linden/indra/newview/llpanelpermissions.h')
| -rw-r--r-- | linden/indra/newview/llpanelpermissions.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/llpanelpermissions.h b/linden/indra/newview/llpanelpermissions.h index 3b73254..57339ed 100644 --- a/linden/indra/newview/llpanelpermissions.h +++ b/linden/indra/newview/llpanelpermissions.h | |||
| @@ -68,6 +68,7 @@ protected: | |||
| 68 | static void onClickRelease(void*); | 68 | static void onClickRelease(void*); |
| 69 | static void onClickCreator(void*); | 69 | static void onClickCreator(void*); |
| 70 | static void onClickOwner(void*); | 70 | static void onClickOwner(void*); |
| 71 | static void onClickLastOwner(void*); | ||
| 71 | static void onClickGroup(void*); | 72 | static void onClickGroup(void*); |
| 72 | static void cbGroupID(LLUUID group_id, void* userdata); | 73 | static void cbGroupID(LLUUID group_id, void* userdata); |
| 73 | static void onClickDeedToGroup(void*); | 74 | static void onClickDeedToGroup(void*); |