livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- internal : reviewed for SL-3.0 

--HG--
branch : UI-Base
master
Kitty Barnett 2011-09-19 22:56:33 +02:00
parent 9f76504c36
commit 4a87f6c907
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgpatchinfo/UI-Base.desc
View File

@ -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

4
indra/llui/llfloaterreg.cpp
View File

@ -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)

6
indra/llui/llfloaterreg.h
View File

@ -41,7 +41,7 @@ class LLFloater;
class LLUICtrl;
typedef boost::function<LLFloater* (const LLSD& key)> 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<const std::string& (void)> 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]

4
indra/llui/llpanel.h
View File

@ -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<T>::LLRegisterPanelClassWrapper(const std::string& t
LLRegisterPanelClass::instance().addPanelClass(tag,&LLRegisterPanelClass::defaultPanelClassBuilder<T>);
}
// [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<typename T>
LLRegisterPanelClassWrapper<T>::LLRegisterPanelClassWrapper(const std::string& tag, LLPanelClassCreatorFunc func)
{