diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-27 14:54:57 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-27 14:54:57 -0400 |
commit | 8c318d16393229044a401243a95fc8bb5e805c7f (patch) | |
tree | 56edab693a1977fb117eb7e2d85b60648898cee1 /indra/newview/llavataractions.h | |
parent | 1eda81eac813447cd357ac1972654ee9c1ec5506 (diff) | |
parent | e062be734ae421cc793a4c5e2e077a0c1d22262d (diff) |
reconciled .hgtags
Diffstat (limited to 'indra/newview/llavataractions.h')
-rw-r--r-- | indra/newview/llavataractions.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llavataractions.h b/indra/newview/llavataractions.h index fbfd815f41..748b7cb3d1 100644 --- a/indra/newview/llavataractions.h +++ b/indra/newview/llavataractions.h @@ -35,7 +35,7 @@ #include <vector> class LLInventoryPanel; - +class LLFloater; /** * Friend-related actions (add, remove, offer teleport, etc) @@ -96,6 +96,7 @@ public: static void showProfile(const LLUUID& id); static void hideProfile(const LLUUID& id); static bool profileVisible(const LLUUID& id); + static LLFloater* getProfileFloater(const LLUUID& id); /** * Show avatar on world map. |