Skip to content
Snippets Groups Projects
Commit 0c9d8d91 authored by Richard Linden's avatar Richard Linden
Browse files

fixed build

fixed handle downcast not initiating handle
parent 7e6e3d20
No related branches found
No related tags found
No related merge requests found
......@@ -169,7 +169,7 @@ class LLHandleProvider
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;
}
......
......@@ -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;
......
......@@ -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);
......
......@@ -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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment