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

Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.

meow-7.2.2
Todd Stinson 2012-07-26 18:59:27 -07:00
parent 1e65ba1f90 797825a222
commit e97d0f4195
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
indra/llxuixml/llinitparam.h
View File

@ -2015,10 +2015,12 @@ namespace LLInitParam
}
};
class Deprecated : public Param
// can appear in data files, but will ignored during parsing
// cannot read or write in code
class Ignored : public Param
{
public:
explicit Deprecated(const char* name)
explicit Ignored(const char* name)
: Param(DERIVED_BLOCK::getBlockDescriptor().mCurrentBlockPtr)
{
BlockDescriptor& block_descriptor = DERIVED_BLOCK::getBlockDescriptor();
@ -2049,8 +2051,34 @@ namespace LLInitParam
}
};
// different semantics for documentation purposes, but functionally identical
typedef Deprecated Ignored;
// can appear in data files, or be written to in code, but data will be ignored
// cannot be read in code
class Deprecated : public Ignored
{
public:
explicit Deprecated(const char* name) : Ignored(name) {}
// dummy writer interfaces
template<typename T>
Deprecated& operator =(const T& val)
{
// do nothing
return *this;
}
template<typename T>
DERIVED_BLOCK& operator()(const T& val)
{
// do nothing
return static_cast<DERIVED_BLOCK&>(Param::enclosingBlock());
}
template<typename T>
void set(const T& val, bool flag_as_provided = true)
{
// do nothing
}
};
public:
static BlockDescriptor& getBlockDescriptor()

2
indra/newview/llinventoryfilter.cpp
View File

@ -89,7 +89,7 @@ bool LLInventoryFilter::check(const LLFolderViewModelItem* item)
const BOOL passed_clipboard = (listener ? checkAgainstClipboard(listener->getUUID()) : TRUE);
// If it's a folder and we're showing all folders, return automatically.
const BOOL is_folder = listener->getInventoryType() == LLInventoryType::IT_CATEGORY;;
const BOOL is_folder = listener->getInventoryType() == LLInventoryType::IT_CATEGORY;
if (is_folder && (mFilterOps.mShowFolderState == LLInventoryFilter::SHOW_ALL_FOLDERS))
{
return passed_clipboard;