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

fixed build 

fixed handle downcast not initiating handle
meow-7.2.2
Richard Linden 2011-11-10 16:02:57 -08:00
parent 7e6e3d20f3
commit 0c9d8d917a
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llhandle.h
View File

@ -169,7 +169,7 @@ protected:
typename LLHandle<U> getDerivedHandle(typename boost::enable_if< typename boost::is_convertible<U*, T*> >::type* dummy = 0) const
{
LLHandle<U> downcast_handle;
downcast_handle.mTombStone = mHandle.mTombStone;
downcast_handle.mTombStone = getHandle().mTombStone;
return downcast_handle;
}

2
indra/llxuixml/llinitparam.h
View File

@ -671,6 +671,7 @@ namespace LLInitParam
self_t& operator =(const self_t& other)
{
mValue = other.mValue;
return *this;
}
private:
@ -741,6 +742,7 @@ namespace LLInitParam
self_t& operator =(const self_t& other)
{
*(static_cast<T*>(this)) = other;
return *this;
}
protected:
mutable S32 mValidatedVersion;

4
indra/newview/llfloaterwebcontent.cpp
View File

@ -167,7 +167,7 @@ LLFloater* LLFloaterWebContent::create( Params p)
//static
void LLFloaterWebContent::closeRequest(const std::string &uuid)
{
LLFloaterWebContent* floaterp = getInstance(uuid);
LLFloaterWebContent* floaterp = instance_tracker_t::getInstance(uuid);
if (floaterp)
{
floaterp->closeFloater(false);
@ -177,7 +177,7 @@ void LLFloaterWebContent::closeRequest(const std::string &uuid)
//static
void LLFloaterWebContent::geometryChanged(const std::string &uuid, S32 x, S32 y, S32 width, S32 height)
{
LLFloaterWebContent* floaterp = getInstance(uuid);
LLFloaterWebContent* floaterp = instance_tracker_t::getInstance(uuid);
if (floaterp)
{
floaterp->geometryChanged(x, y, width, height);

1
indra/newview/llfloaterwebcontent.h
View File

@ -43,6 +43,7 @@ class LLFloaterWebContent :
public LLInstanceTracker<LLFloaterWebContent, std::string>
{
public:
typedef LLInstanceTracker<LLFloaterWebContent, std::string> instance_tracker_t;
LOG_CLASS(LLFloaterWebContent);
struct _Params : public LLInitParam::Block<_Params>