From 4a87f6c9073cafd9d1bdfa673473278fa486f228 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Mon, 19 Sep 2011 22:56:33 +0200 Subject: [PATCH] - 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) {