diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
| commit | 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 (patch) | |
| tree | 4a505c1e0919af52800b3ffb3eaf135e7d6f9ce6 /indra/newview/llfloaterproperties.h | |
| parent | 351ebe9fcb76f3b99c2957004bb8493a904869ee (diff) | |
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
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 |