diff options
author | Callum Prentice <callum@lindenlab.com> | 2010-01-20 15:30:07 -0800 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2010-01-20 15:30:07 -0800 |
commit | 8aadfb1cb63a9527835c6c5127d041d924455505 (patch) | |
tree | 3fd5f231cae133ec25f0d0d4bf9eda53d0d4c0e4 /indra/newview/llpanelplaces.h | |
parent | 622f8b59ceb286f955351b6185a98919f03ed136 (diff) | |
parent | 20af2d325a4340aca997efbea752849e9f15d041 (diff) |
Merge with tip
Diffstat (limited to 'indra/newview/llpanelplaces.h')
-rw-r--r-- | indra/newview/llpanelplaces.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llpanelplaces.h b/indra/newview/llpanelplaces.h index b134cf0cba..27b5911ebb 100644 --- a/indra/newview/llpanelplaces.h +++ b/indra/newview/llpanelplaces.h @@ -75,6 +75,8 @@ public: std::string getPlaceInfoType() { return mPlaceInfoType; } + /*virtual*/ S32 notifyParent(const LLSD& info); + private: void onLandmarkLoaded(LLLandmark* landmark); void onFilterEdit(const std::string& search_string, bool force_filter); |