aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterbuy.h
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-06-07 23:14:43 -0700
committerMcCabe Maxsted2009-06-07 23:14:43 -0700
commite0a70bea805cf07b92efabca15ffe56a777f90ac (patch)
tree2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/newview/llfloaterbuy.h
parent1.1 version final (diff)
parentMerge branch 'sl-base-1.22' into next (diff)
downloadmeta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.zip
meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.gz
meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.bz2
meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.xz
Moved base up to 1.22
Diffstat (limited to 'linden/indra/newview/llfloaterbuy.h')
-rw-r--r--linden/indra/newview/llfloaterbuy.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloaterbuy.h b/linden/indra/newview/llfloaterbuy.h
index 0eef41b..06cf41e 100644
--- a/linden/indra/newview/llfloaterbuy.h
+++ b/linden/indra/newview/llfloaterbuy.h
@@ -5,7 +5,7 @@
5 * 5 *
6 * $LicenseInfo:firstyear=2004&license=viewergpl$ 6 * $LicenseInfo:firstyear=2004&license=viewergpl$
7 * 7 *
8 * Copyright (c) 2004-2008, Linden Research, Inc. 8 * Copyright (c) 2004-2009, Linden Research, Inc.
9 * 9 *
10 * Second Life Viewer Source Code 10 * Second Life Viewer Source Code
11 * The source code in this file ("Source Code") is provided by Linden Lab 11 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -57,6 +57,7 @@ protected:
57 LLFloaterBuy(); 57 LLFloaterBuy();
58 ~LLFloaterBuy(); 58 ~LLFloaterBuy();
59 59
60 /*virtual*/ void onClose(bool app_quitting);
60 void reset(); 61 void reset();
61 62
62 void requestObjectInventories(); 63 void requestObjectInventories();
@@ -65,8 +66,6 @@ protected:
65 S32 serial_num, 66 S32 serial_num,
66 void* data); 67 void* data);
67 68
68 /*virtual*/ void close(bool app_quitting = false);
69
70 static void onClickBuy(void*); 69 static void onClickBuy(void*);
71 static void onClickCancel(void*); 70 static void onClickCancel(void*);
72 71