diff options
author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-02 12:13:52 -0500 |
---|---|---|
committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-02 12:13:52 -0500 |
commit | cdf639087011dc7f4510cedd9951e8d890818b97 (patch) | |
tree | 6d70a6994ab11f0677370dda4f80a205d00660a1 /indra/newview/llpanelpicks.cpp | |
parent | 7335c6276865061d8b4a549b7cf29f8a8df929a0 (diff) | |
parent | 3783852444825edf420e6109927df21fd004c3e7 (diff) |
merging in viewer2 changes
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llpanelpicks.cpp')
-rw-r--r-- | indra/newview/llpanelpicks.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index aa6909560d..6181531f82 100644 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -73,10 +73,10 @@ LLPanelPicks::LLPanelPicks() mPopupMenu(NULL), mProfilePanel(NULL), mPickPanel(NULL), - mPicksList(NULL) - , mPanelPickInfo(NULL) - , mPanelPickEdit(NULL) - , mOverflowMenu(NULL) + mPicksList(NULL), + mPanelPickInfo(NULL), + mPanelPickEdit(NULL), + mOverflowMenu(NULL) { } |