summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterbuy.h
diff options
context:
space:
mode:
authorMark Palange <palange@lindenlab.com>2008-11-07 17:51:03 +0000
committerMark Palange <palange@lindenlab.com>2008-11-07 17:51:03 +0000
commitf89f19990cbb9f3f2e7473ac6c159098bdfabec7 (patch)
treee7fa406e2db5e9adc2e24e00557d7b3d3f93203a /indra/newview/llfloaterbuy.h
parentb2bfb128e7d30e1cdb293a2ac192a0cbe63fe528 (diff)
QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
Diffstat (limited to 'indra/newview/llfloaterbuy.h')
-rw-r--r--indra/newview/llfloaterbuy.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llfloaterbuy.h b/indra/newview/llfloaterbuy.h
index 1506b465d6..b1678c7c9f 100644
--- a/indra/newview/llfloaterbuy.h
+++ b/indra/newview/llfloaterbuy.h
@@ -57,6 +57,7 @@ protected:
LLFloaterBuy();
~LLFloaterBuy();
+ /*virtual*/ void onClose(bool app_quitting);
void reset();
void requestObjectInventories();
@@ -65,8 +66,6 @@ protected:
S32 serial_num,
void* data);
- /*virtual*/ void close(bool app_quitting = false);
-
static void onClickBuy(void*);
static void onClickCancel(void*);