diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
| commit | a4000c3744e42fcbb638e742f3b63fa31a0dee15 (patch) | |
| tree | 7f472c30e65bbfa04ee9bc06631a1af305cc31fb /indra/newview/llfloaterproperties.h | |
| parent | 6c4cadbb04d633ad7b762058bdeba6e1f650dafd (diff) | |
merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7
Diffstat (limited to 'indra/newview/llfloaterproperties.h')
| -rw-r--r-- | indra/newview/llfloaterproperties.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llfloaterproperties.h b/indra/newview/llfloaterproperties.h index 2f5d97d384..d0e5abefb8 100644 --- a/indra/newview/llfloaterproperties.h +++ b/indra/newview/llfloaterproperties.h @@ -34,7 +34,7 @@ #define LL_LLFLOATERPROPERTIES_H #include <map> -#include "llfloater.h" +#include "llmultifloater.h" #include "lliconctrl.h" //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -54,16 +54,16 @@ class LLFloaterProperties : public LLFloater { public: static LLFloaterProperties* find(const LLUUID& item_id, - const LLUUID& object_id); + const LLUUID& object_id = LLUUID::null); static LLFloaterProperties* show(const LLUUID& item_id, - const LLUUID& object_id); + const LLUUID& object_id = LLUUID::null); static void dirtyAll(); static void closeByID(const LLUUID& item_id, const LLUUID& object_id); - LLFloaterProperties(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_id, const LLUUID& object_id); + LLFloaterProperties(const LLUUID& item_id, const LLUUID& object_id); virtual ~LLFloaterProperties(); - + /*virtual*/ BOOL postBuild(); // do everything necessary void dirty() { mDirty = TRUE; } void refresh(); @@ -104,7 +104,7 @@ protected: class LLMultiProperties : public LLMultiFloater { public: - LLMultiProperties(const LLRect& rect); + LLMultiProperties(); }; #endif // LL_LLFLOATERPROPERTIES_H |