diff options
| author | McCabe Maxsted | 2009-09-27 21:44:44 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-09-27 21:44:44 -0700 |
| commit | a8477f3570e249ee8b4a089340001ff9b26f69c0 (patch) | |
| tree | 4c81383dc2b4bb650141147a08151c3f0be9547e /linden/indra/newview/primbackup.h | |
| parent | Show disabled buttons for own profile rather than hiding them (diff) | |
| parent | Rearranged the Import stuff in the File menu. (diff) | |
| download | meta-impy-a8477f3570e249ee8b4a089340001ff9b26f69c0.zip meta-impy-a8477f3570e249ee8b4a089340001ff9b26f69c0.tar.gz meta-impy-a8477f3570e249ee8b4a089340001ff9b26f69c0.tar.bz2 meta-impy-a8477f3570e249ee8b4a089340001ff9b26f69c0.tar.xz | |
Merge jacek/next into 1.2.0-next
Diffstat (limited to 'linden/indra/newview/primbackup.h')
| -rw-r--r-- | linden/indra/newview/primbackup.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/primbackup.h b/linden/indra/newview/primbackup.h index fddc35f..cbd757a 100644 --- a/linden/indra/newview/primbackup.h +++ b/linden/indra/newview/primbackup.h | |||
| @@ -18,6 +18,8 @@ class primbackup : public LLFloater | |||
| 18 | //Static accessor | 18 | //Static accessor |
| 19 | static primbackup* getInstance(); | 19 | static primbackup* getInstance(); |
| 20 | 20 | ||
| 21 | static bool check_perms( LLSelectNode* node ); | ||
| 22 | |||
| 21 | virtual ~primbackup(); | 23 | virtual ~primbackup(); |
| 22 | 24 | ||
| 23 | //Floater stuff | 25 | //Floater stuff |