diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-06-24 19:37:35 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-06-24 19:37:35 -0400 |
commit | c77efc92e3ebcb9af9bb997e5b709484153844d4 (patch) | |
tree | 57f58946a62b16dc623d7469d59bef19f514d574 /indra/newview/llsidepanelinventory.h | |
parent | 9f835b9bce6ac023a9f8b98cfb53015f5d416130 (diff) | |
parent | c6b80b47459711cc4c0b1971cb954ad6148517a0 (diff) |
automated merge
Diffstat (limited to 'indra/newview/llsidepanelinventory.h')
-rw-r--r-- | indra/newview/llsidepanelinventory.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llsidepanelinventory.h b/indra/newview/llsidepanelinventory.h index 13275d14c0..951fdd630c 100644 --- a/indra/newview/llsidepanelinventory.h +++ b/indra/newview/llsidepanelinventory.h @@ -94,6 +94,7 @@ private: LLButton* mPlayBtn; LLButton* mTeleportBtn; LLButton* mOverflowBtn; + LLButton* mShopBtn; }; |