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

Initialize RLV outfit observer later. From Shin Wasp, fixes FIRE-857.

meow-7.2.2
Tonya Souther 2011-04-12 17:30:29 -05:00
parent 861d4e22b2
commit 80d159a9ec
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/rlvlocks.cpp
View File

@ -922,7 +922,15 @@ RlvFolderLocks gRlvFolderLocks;
RlvFolderLocks::RlvFolderLocks()
: m_fItemsDirty(true)
{
LLOutfitObserver::instance().addCOFChangedCallback(boost::bind(&RlvFolderLocks::onCOFChanged, this));
//LLOutfitObserver::instance().addCOFChangedCallback(boost::bind(&RlvFolderLocks::onCOFChanged, this));
}
// static
void RlvFolderLocks::initClass()
{
// this can not be called from constructor because its instance is global and is created too early.
// Subscribe to "COF is Saved" signal to notify observers about this (Loading indicator for ex.).
LLOutfitObserver::instance().addCOFChangedCallback(boost::bind(&RlvFolderLocks::onCOFChanged, &gRlvFolderLocks));
}
// Checked: 2010-11-30 (RLVa-1.3.0b) | Added: RLVa-1.3.0b

4
indra/newview/rlvlocks.h
View File

@ -291,7 +291,7 @@ extern RlvWearableLocks gRlvWearableLocks;
// RlvFolderLocks class declaration
//
class RlvFolderLocks
class RlvFolderLocks: public LLInitClass<RlvFolderLocks>
{
public:
RlvFolderLocks();
@ -301,6 +301,8 @@ public:
// Couples the folder lock source with the type of lock (false = folder node ; true = folder subtree)
typedef std::pair<rlv_folderlock_source_t, bool> rlv_folderlock_descr_t;
static void initClass();
public:
// Adds an eLock type lock (held by idRlvObj) for the folder(s) described by lockDescr
void addFolderLock(const rlv_folderlock_descr_t& lockDescr, const LLUUID& idRlvObj, ERlvLockMask eLock);