diff options
author | Leslie Linden <leslie@lindenlab.com> | 2011-12-12 16:13:23 -0800 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2011-12-12 16:13:23 -0800 |
commit | 90b8fb07ccd46bd18f3629ae2ec04a47312b41cb (patch) | |
tree | 2e0a016cf2a0a3a869086dbde4e2f372bfe3f2c1 /indra/newview/llfloaterinspect.h | |
parent | e826cbd90750fd38565e4e44390948f36254cf1f (diff) | |
parent | e859c3446b5c631fe0a9806434aa19b64a0d9113 (diff) |
Merge with latest from viewer-experience
Diffstat (limited to 'indra/newview/llfloaterinspect.h')
-rw-r--r-- | indra/newview/llfloaterinspect.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfloaterinspect.h b/indra/newview/llfloaterinspect.h index d9ffdf114b..7ee83ccdb4 100644 --- a/indra/newview/llfloaterinspect.h +++ b/indra/newview/llfloaterinspect.h @@ -29,6 +29,7 @@ #ifndef LL_LLFLOATERINSPECT_H #define LL_LLFLOATERINSPECT_H +#include "llavatarname.h" #include "llfloater.h" //class LLTool; @@ -53,6 +54,9 @@ public: void onClickCreatorProfile(); void onClickOwnerProfile(); void onSelectObject(); + + static void onGetAvNameCallback(const LLUUID& idCreator, const LLAvatarName& av_name, void* FloaterPtr); + LLScrollListCtrl* mObjectList; protected: // protected members |