From 17460d9fb8cf6535784c227d783fda82a1cf38d5 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Wed, 1 Dec 2010 15:14:10 +0100 Subject: [PATCH 1/7] Started UI-Base patch branch --HG-- branch : UI-Base --- .hgpatchinfo/UI-Base.dep | 1 + 1 file changed, 1 insertion(+) create mode 100644 .hgpatchinfo/UI-Base.dep diff --git a/.hgpatchinfo/UI-Base.dep b/.hgpatchinfo/UI-Base.dep new file mode 100644 index 0000000000..ced3cbd7d7 --- /dev/null +++ b/.hgpatchinfo/UI-Base.dep @@ -0,0 +1 @@ +3f9effd60faa3d5a3250f3a9fc64b06e96863b42 \ No newline at end of file From 75d993d794e74682d9a7c416cad833ad3554e8a0 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Wed, 1 Dec 2010 15:27:46 +0100 Subject: [PATCH 2/7] - added : static registration of an LLPanel derived class with a custom class creator -> used in the UI-SidepanelOutfits patch branch --HG-- branch : UI-Base --- indra/llui/llpanel.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h index c1a1a06f39..1c86e4e74d 100644 --- a/indra/llui/llpanel.h +++ b/indra/llui/llpanel.h @@ -333,6 +333,9 @@ class LLRegisterPanelClassWrapper public: // reigister with either the provided builder, or the generic templated builder LLRegisterPanelClassWrapper(const std::string& tag); +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.4.0g) | Added: Catznip-2.4.0g + LLRegisterPanelClassWrapper(const std::string& tag, LLPanelClassCreatorFunc func); +// [/SL:KB] }; @@ -342,5 +345,12 @@ LLRegisterPanelClassWrapper::LLRegisterPanelClassWrapper(const std::string& t LLRegisterPanelClass::instance().addPanelClass(tag,&LLRegisterPanelClass::defaultPanelClassBuilder); } +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.4.0g) | Added: Catznip-2.4.0g +template +LLRegisterPanelClassWrapper::LLRegisterPanelClassWrapper(const std::string& tag, LLPanelClassCreatorFunc func) +{ + LLRegisterPanelClass::instance().addPanelClass(tag, func); +} +// [/SL:KB] #endif From 7b82aa3932ed2cb61dfd2c450319a2caa07266bc Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Wed, 1 Dec 2010 15:30:01 +0100 Subject: [PATCH 3/7] - added : registration of an LLFloater derived class with a callback for the XML filename -> used in the Chat-Misc patch branch --HG-- branch : UI-Base --- indra/llui/llfloaterreg.cpp | 17 ++++++++++++++++- indra/llui/llfloaterreg.h | 11 +++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp index 4677d535db..352c644395 100644 --- a/indra/llui/llfloaterreg.cpp +++ b/indra/llui/llfloaterreg.cpp @@ -56,6 +56,18 @@ void LLFloaterReg::add(const std::string& name, const std::string& filename, con sGroupMap[groupname] = groupname; // for referencing directly by group name } +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.4.0g) | Added: Catznip-2.4.0g +//static +void LLFloaterReg::addWithFileCallback(const std::string& name, const LLFloaterFileFunc& fileFunc, + const LLFloaterBuildFunc& func, const std::string& groupname) +{ + sBuildMap[name].mFunc = func; + sBuildMap[name].mFileFunc = fileFunc; + sGroupMap[name] = groupname.empty() ? name : groupname; + sGroupMap[groupname] = groupname; // for referencing directly by group name +} +// [/SL:KB] + //static LLRect LLFloaterReg::getFloaterRect(const std::string& name) { @@ -110,7 +122,10 @@ LLFloater* LLFloaterReg::getInstance(const std::string& name, const LLSD& key) if (!res) { const LLFloaterBuildFunc& build_func = sBuildMap[name].mFunc; - const std::string& xui_file = sBuildMap[name].mFile; +// const std::string& xui_file = sBuildMap[name].mFile; +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.4.0g) | Added: Catznip-2.4.0g + const std::string& xui_file = (!sBuildMap[name].mFileFunc) ? sBuildMap[name].mFile : sBuildMap[name].mFileFunc(); +// [/SL:KB] if (build_func) { const std::string& groupname = sGroupMap[name]; diff --git a/indra/llui/llfloaterreg.h b/indra/llui/llfloaterreg.h index 94387fb41a..913849e7f9 100644 --- a/indra/llui/llfloaterreg.h +++ b/indra/llui/llfloaterreg.h @@ -45,6 +45,9 @@ class LLFloater; typedef boost::function LLFloaterBuildFunc; +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.4.0g) | Added: Catznip-2.4.0g +typedef boost::function LLFloaterFileFunc; +// [/SL:KB] class LLFloaterReg { @@ -59,6 +62,9 @@ public: struct BuildData { LLFloaterBuildFunc mFunc; +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.4.0g) | Added: Catznip-2.4.0g + LLFloaterFileFunc mFileFunc; +// [/SL:KB] std::string mFile; }; typedef std::map build_map_t; @@ -89,6 +95,11 @@ public: static void add(const std::string& name, const std::string& file, const LLFloaterBuildFunc& func, const std::string& groupname = LLStringUtil::null); +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.4.0g) | Added: Catznip-2.4.0g + static void addWithFileCallback(const std::string& name, const LLFloaterFileFunc& fileFunc, const LLFloaterBuildFunc& func, + const std::string& groupname = LLStringUtil::null); +// [/SL:KB] + // Helpers static LLRect getFloaterRect(const std::string& name); From e84d0d48c1b1a5d8faf3a5c24e674de397efe683 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Wed, 1 Dec 2010 15:32:01 +0100 Subject: [PATCH 4/7] - internal : updated patch description for UI-Base --HG-- branch : UI-Base --- .hgpatchinfo/UI-Base.desc | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .hgpatchinfo/UI-Base.desc diff --git a/.hgpatchinfo/UI-Base.desc b/.hgpatchinfo/UI-Base.desc new file mode 100644 index 0000000000..eec7c7d666 --- /dev/null +++ b/.hgpatchinfo/UI-Base.desc @@ -0,0 +1,5 @@ +[UI/Base] +- added : static registration of an LLPanel derived class with a custom class creator + -> used in the UI-SidepanelOutfits patch branch +- added : registration of an LLFloater derived class with a callback for the XML filename + -> used in the Chat-Misc patch branch From 10c8f39e00e295e5aae7f2957bd1584a22d0f224 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Sat, 19 Mar 2011 13:55:03 +0100 Subject: [PATCH 5/7] - internal : reviewed for SL-2.5.2 --HG-- branch : UI-Base --- indra/llui/llfloaterreg.cpp | 4 ++-- indra/llui/llfloaterreg.h | 6 +++--- indra/llui/llpanel.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp index 352c644395..23936e01c5 100644 --- a/indra/llui/llfloaterreg.cpp +++ b/indra/llui/llfloaterreg.cpp @@ -56,7 +56,7 @@ void LLFloaterReg::add(const std::string& name, const std::string& filename, con sGroupMap[groupname] = groupname; // for referencing directly by group name } -// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.4.0g) | Added: Catznip-2.4.0g +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.5.0a) | Added: Catznip-2.4.0g //static void LLFloaterReg::addWithFileCallback(const std::string& name, const LLFloaterFileFunc& fileFunc, const LLFloaterBuildFunc& func, const std::string& groupname) @@ -123,7 +123,7 @@ LLFloater* LLFloaterReg::getInstance(const std::string& name, const LLSD& key) { const LLFloaterBuildFunc& build_func = sBuildMap[name].mFunc; // const std::string& xui_file = sBuildMap[name].mFile; -// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.4.0g) | Added: Catznip-2.4.0g +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.5.0a) | Added: Catznip-2.5.0a const std::string& xui_file = (!sBuildMap[name].mFileFunc) ? sBuildMap[name].mFile : sBuildMap[name].mFileFunc(); // [/SL:KB] if (build_func) diff --git a/indra/llui/llfloaterreg.h b/indra/llui/llfloaterreg.h index 913849e7f9..288d965f81 100644 --- a/indra/llui/llfloaterreg.h +++ b/indra/llui/llfloaterreg.h @@ -45,7 +45,7 @@ class LLFloater; typedef boost::function LLFloaterBuildFunc; -// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.4.0g) | Added: Catznip-2.4.0g +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.5.0a) | Added: Catznip-2.4.0g typedef boost::function LLFloaterFileFunc; // [/SL:KB] @@ -62,7 +62,7 @@ public: struct BuildData { LLFloaterBuildFunc mFunc; -// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.4.0g) | Added: Catznip-2.4.0g +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.5.0a) | Added: Catznip-2.4.0g LLFloaterFileFunc mFileFunc; // [/SL:KB] std::string mFile; @@ -95,7 +95,7 @@ public: static void add(const std::string& name, const std::string& file, const LLFloaterBuildFunc& func, const std::string& groupname = LLStringUtil::null); -// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.4.0g) | Added: Catznip-2.4.0g +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.5.0a) | Added: Catznip-2.4.0g static void addWithFileCallback(const std::string& name, const LLFloaterFileFunc& fileFunc, const LLFloaterBuildFunc& func, const std::string& groupname = LLStringUtil::null); // [/SL:KB] diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h index 1c86e4e74d..7ed8b7e05d 100644 --- a/indra/llui/llpanel.h +++ b/indra/llui/llpanel.h @@ -333,7 +333,7 @@ class LLRegisterPanelClassWrapper public: // reigister with either the provided builder, or the generic templated builder LLRegisterPanelClassWrapper(const std::string& tag); -// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.4.0g) | Added: Catznip-2.4.0g +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.5.0a) | Added: Catznip-2.4.0g LLRegisterPanelClassWrapper(const std::string& tag, LLPanelClassCreatorFunc func); // [/SL:KB] }; @@ -345,7 +345,7 @@ LLRegisterPanelClassWrapper::LLRegisterPanelClassWrapper(const std::string& t LLRegisterPanelClass::instance().addPanelClass(tag,&LLRegisterPanelClass::defaultPanelClassBuilder); } -// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.4.0g) | Added: Catznip-2.4.0g +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.5.0a) | Added: Catznip-2.4.0g template LLRegisterPanelClassWrapper::LLRegisterPanelClassWrapper(const std::string& tag, LLPanelClassCreatorFunc func) { From 78166bd74023f2bf5a17654dd28e1e589a967da0 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Tue, 19 Apr 2011 16:58:30 +0200 Subject: [PATCH 6/7] - internal : reviewed for SL-2.6.0 --HG-- branch : UI-Base --- indra/llui/llfloaterreg.cpp | 4 ++-- indra/llui/llfloaterreg.h | 6 +++--- indra/llui/llpanel.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp index 23936e01c5..13dcf43dea 100644 --- a/indra/llui/llfloaterreg.cpp +++ b/indra/llui/llfloaterreg.cpp @@ -56,7 +56,7 @@ void LLFloaterReg::add(const std::string& name, const std::string& filename, con sGroupMap[groupname] = groupname; // for referencing directly by group name } -// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.5.0a) | Added: Catznip-2.4.0g +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.6.0a) | Added: Catznip-2.4.0g //static void LLFloaterReg::addWithFileCallback(const std::string& name, const LLFloaterFileFunc& fileFunc, const LLFloaterBuildFunc& func, const std::string& groupname) @@ -123,7 +123,7 @@ LLFloater* LLFloaterReg::getInstance(const std::string& name, const LLSD& key) { const LLFloaterBuildFunc& build_func = sBuildMap[name].mFunc; // const std::string& xui_file = sBuildMap[name].mFile; -// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.5.0a) | Added: Catznip-2.5.0a +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.6.0a) | Added: Catznip-2.5.0a const std::string& xui_file = (!sBuildMap[name].mFileFunc) ? sBuildMap[name].mFile : sBuildMap[name].mFileFunc(); // [/SL:KB] if (build_func) diff --git a/indra/llui/llfloaterreg.h b/indra/llui/llfloaterreg.h index 288d965f81..0fb56647e3 100644 --- a/indra/llui/llfloaterreg.h +++ b/indra/llui/llfloaterreg.h @@ -45,7 +45,7 @@ class LLFloater; typedef boost::function LLFloaterBuildFunc; -// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.5.0a) | Added: Catznip-2.4.0g +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.6.0a) | Added: Catznip-2.4.0g typedef boost::function LLFloaterFileFunc; // [/SL:KB] @@ -62,7 +62,7 @@ public: struct BuildData { LLFloaterBuildFunc mFunc; -// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.5.0a) | Added: Catznip-2.4.0g +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.6.0a) | Added: Catznip-2.4.0g LLFloaterFileFunc mFileFunc; // [/SL:KB] std::string mFile; @@ -95,7 +95,7 @@ public: static void add(const std::string& name, const std::string& file, const LLFloaterBuildFunc& func, const std::string& groupname = LLStringUtil::null); -// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.5.0a) | Added: Catznip-2.4.0g +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.6.0a) | Added: Catznip-2.4.0g static void addWithFileCallback(const std::string& name, const LLFloaterFileFunc& fileFunc, const LLFloaterBuildFunc& func, const std::string& groupname = LLStringUtil::null); // [/SL:KB] diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h index 7ed8b7e05d..bcfc8ce02f 100644 --- a/indra/llui/llpanel.h +++ b/indra/llui/llpanel.h @@ -333,7 +333,7 @@ class LLRegisterPanelClassWrapper public: // reigister with either the provided builder, or the generic templated builder LLRegisterPanelClassWrapper(const std::string& tag); -// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.5.0a) | Added: Catznip-2.4.0g +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.6.0a) | Added: Catznip-2.4.0g LLRegisterPanelClassWrapper(const std::string& tag, LLPanelClassCreatorFunc func); // [/SL:KB] }; @@ -345,7 +345,7 @@ LLRegisterPanelClassWrapper::LLRegisterPanelClassWrapper(const std::string& t LLRegisterPanelClass::instance().addPanelClass(tag,&LLRegisterPanelClass::defaultPanelClassBuilder); } -// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.5.0a) | Added: Catznip-2.4.0g +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.6.0a) | Added: Catznip-2.4.0g template LLRegisterPanelClassWrapper::LLRegisterPanelClassWrapper(const std::string& tag, LLPanelClassCreatorFunc func) { From 4a87f6c9073cafd9d1bdfa673473278fa486f228 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Mon, 19 Sep 2011 22:56:33 +0200 Subject: [PATCH 7/7] - internal : reviewed for SL-3.0 --HG-- branch : UI-Base --- .hgpatchinfo/UI-Base.desc | 1 + indra/llui/llfloaterreg.cpp | 4 ++-- indra/llui/llfloaterreg.h | 6 +++--- indra/llui/llpanel.h | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.hgpatchinfo/UI-Base.desc b/.hgpatchinfo/UI-Base.desc index eec7c7d666..1678043a31 100644 --- a/.hgpatchinfo/UI-Base.desc +++ b/.hgpatchinfo/UI-Base.desc @@ -3,3 +3,4 @@ -> used in the UI-SidepanelOutfits patch branch - added : registration of an LLFloater derived class with a callback for the XML filename -> used in the Chat-Misc patch branch + -> used in the Chat-NearbyChat patch branch diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp index 010c3ba096..b2632f0f51 100644 --- a/indra/llui/llfloaterreg.cpp +++ b/indra/llui/llfloaterreg.cpp @@ -56,7 +56,7 @@ void LLFloaterReg::add(const std::string& name, const std::string& filename, con sGroupMap[groupname] = groupname; // for referencing directly by group name } -// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.6.0a) | Added: Catznip-2.4.0g +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-3.0.0a) | Added: Catznip-2.4.0g //static void LLFloaterReg::addWithFileCallback(const std::string& name, const LLFloaterFileFunc& fileFunc, const LLFloaterBuildFunc& func, const std::string& groupname) @@ -113,7 +113,7 @@ LLFloater* LLFloaterReg::getInstance(const std::string& name, const LLSD& key) { const LLFloaterBuildFunc& build_func = sBuildMap[name].mFunc; // const std::string& xui_file = sBuildMap[name].mFile; -// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.6.0a) | Added: Catznip-2.5.0a +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-3.0.0a) | Added: Catznip-2.5.0a const std::string& xui_file = (!sBuildMap[name].mFileFunc) ? sBuildMap[name].mFile : sBuildMap[name].mFileFunc(); // [/SL:KB] if (build_func) diff --git a/indra/llui/llfloaterreg.h b/indra/llui/llfloaterreg.h index adb0fbd4f0..533343eb32 100644 --- a/indra/llui/llfloaterreg.h +++ b/indra/llui/llfloaterreg.h @@ -41,7 +41,7 @@ class LLFloater; class LLUICtrl; typedef boost::function LLFloaterBuildFunc; -// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.6.0a) | Added: Catznip-2.4.0g +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-3.0.0a) | Added: Catznip-2.4.0g typedef boost::function LLFloaterFileFunc; // [/SL:KB] @@ -58,7 +58,7 @@ public: struct BuildData { LLFloaterBuildFunc mFunc; -// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.6.0a) | Added: Catznip-2.4.0g +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-3.0.0a) | Added: Catznip-2.4.0g LLFloaterFileFunc mFileFunc; // [/SL:KB] std::string mFile; @@ -91,7 +91,7 @@ public: static void add(const std::string& name, const std::string& file, const LLFloaterBuildFunc& func, const std::string& groupname = LLStringUtil::null); -// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.6.0a) | Added: Catznip-2.4.0g +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-3.0.0a) | Added: Catznip-2.4.0g static void addWithFileCallback(const std::string& name, const LLFloaterFileFunc& fileFunc, const LLFloaterBuildFunc& func, const std::string& groupname = LLStringUtil::null); // [/SL:KB] diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h index b57d879713..62c358b7a3 100644 --- a/indra/llui/llpanel.h +++ b/indra/llui/llpanel.h @@ -338,7 +338,7 @@ class LLRegisterPanelClassWrapper public: // reigister with either the provided builder, or the generic templated builder LLRegisterPanelClassWrapper(const std::string& tag); -// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.6.0a) | Added: Catznip-2.4.0g +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-3.0.0a) | Added: Catznip-2.4.0g LLRegisterPanelClassWrapper(const std::string& tag, LLPanelClassCreatorFunc func); // [/SL:KB] }; @@ -350,7 +350,7 @@ LLRegisterPanelClassWrapper::LLRegisterPanelClassWrapper(const std::string& t LLRegisterPanelClass::instance().addPanelClass(tag,&LLRegisterPanelClass::defaultPanelClassBuilder); } -// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-2.6.0a) | Added: Catznip-2.4.0g +// [SL:KB] - Patch: UI-Base | Checked: 2010-12-01 (Catznip-3.0.0a) | Added: Catznip-2.4.0g template LLRegisterPanelClassWrapper::LLRegisterPanelClassWrapper(const std::string& tag, LLPanelClassCreatorFunc func) {