diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-11-01 22:02:35 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-11-01 22:02:35 +0000 |
| commit | 7afa8058aae0d5363cc19c7df1e6d2d7ec3bf7ac (patch) | |
| tree | 52f41bda3e57a58e968421212a8a48eead6f653d /indra/newview/llpanelclassified.h | |
| parent | 833e8d5c2a1dd48fd89b8b438dbe56572697bb76 (diff) | |
svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release
QAR-11: pair-reviewed the merge w/ Sam.
Diffstat (limited to 'indra/newview/llpanelclassified.h')
| -rw-r--r-- | indra/newview/llpanelclassified.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llpanelclassified.h b/indra/newview/llpanelclassified.h index 56c2fbda31..6ebac4c98a 100644 --- a/indra/newview/llpanelclassified.h +++ b/indra/newview/llpanelclassified.h @@ -57,7 +57,7 @@ class LLMessageSystem; class LLPanelClassified : public LLPanel { public: - LLPanelClassified(BOOL in_finder); + LLPanelClassified(BOOL in_finder, bool from_search = false); /*virtual*/ ~LLPanelClassified(); void reset(); @@ -79,6 +79,7 @@ public: void initNewClassified(); void setClassifiedID(const LLUUID& id); + void setClickThroughText(const std::string& text); static void setClickThrough(const LLUUID& classified_id, S32 teleport, S32 map, S32 profile); @@ -118,6 +119,7 @@ protected: protected: BOOL mInFinder; + bool mFromSearch; BOOL mDirty; bool mForceClose; bool mLocationChanged; |