Made LLPanel::initPanelXML virtual and override it in LLLayoutPanel. Fixes issue with some panels /still/ being user resizeable if derived from LLLayoutPanel and built from an arbiturary sub-xml file.
This commit is contained in:
@@ -158,7 +158,7 @@ public:
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
LLLayoutPanel(S32 min_dim=-1, BOOL auto_resize=TRUE, BOOL user_resize=TRUE, LLRect rect = LLRect());
|
LLLayoutPanel(S32 min_dim=-1, BOOL auto_resize=TRUE, BOOL user_resize=TRUE, LLRect rect = LLRect());
|
||||||
BOOL initPanelXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
|
/*virtual*/ BOOL initPanelXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
|
||||||
|
|
||||||
bool mAutoResize;
|
bool mAutoResize;
|
||||||
bool mUserResize;
|
bool mUserResize;
|
||||||
|
|||||||
59
indra/llui/llnotificationcontext.h
Normal file
59
indra/llui/llnotificationcontext.h
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
/**
|
||||||
|
* @file llnotifications.h
|
||||||
|
* @brief Notification context class, pulled out of llnotifications.h to avoid including said file in llfloater.h. (Needed, as llnotifications.h includes llevents.h, which causes issues)
|
||||||
|
* @author Q (with assistance from Richard and Coco)
|
||||||
|
*
|
||||||
|
* $LicenseInfo:firstyear=2008&license=viewergpl$
|
||||||
|
*
|
||||||
|
* Copyright (c) 2008-2009, Linden Research, Inc.
|
||||||
|
*
|
||||||
|
* Second Life Viewer Source Code
|
||||||
|
* The source code in this file ("Source Code") is provided by Linden Lab
|
||||||
|
* to you under the terms of the GNU General Public License, version 2.0
|
||||||
|
* ("GPL"), unless you have obtained a separate licensing agreement
|
||||||
|
* ("Other License"), formally executed by you and Linden Lab. Terms of
|
||||||
|
* the GPL can be found in doc/GPL-license.txt in this distribution, or
|
||||||
|
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
|
||||||
|
*
|
||||||
|
* There are special exceptions to the terms and conditions of the GPL as
|
||||||
|
* it is applied to this Source Code. View the full text of the exception
|
||||||
|
* in the file doc/FLOSS-exception.txt in this software distribution, or
|
||||||
|
* online at
|
||||||
|
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
|
||||||
|
*
|
||||||
|
* By copying, modifying or distributing this software, you acknowledge
|
||||||
|
* that you have read and understood your obligations described above,
|
||||||
|
* and agree to abide by those obligations.
|
||||||
|
*
|
||||||
|
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
|
||||||
|
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
|
||||||
|
* COMPLETENESS OR PERFORMANCE.
|
||||||
|
* $/LicenseInfo$
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef LL_LLNOTIFICATION_CONTEX
|
||||||
|
#define LL_LLNOTIFICATION_CONTEX
|
||||||
|
|
||||||
|
// context data that can be looked up via a notification's payload by the display logic
|
||||||
|
// derive from this class to implement specific contexts
|
||||||
|
class LLNotificationContext : public LLInstanceTracker<LLNotificationContext, LLUUID>
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
LLNotificationContext() : LLInstanceTracker<LLNotificationContext, LLUUID>(LLUUID::generateNewID())
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual ~LLNotificationContext() {}
|
||||||
|
|
||||||
|
LLSD asLLSD() const
|
||||||
|
{
|
||||||
|
return getKey();
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif //LL_LLNOTIFICATION_CONTEX
|
||||||
|
|
||||||
@@ -142,7 +142,7 @@ public:
|
|||||||
|
|
||||||
CommitCallbackRegistry::ScopedRegistrar& getCommitCallbackRegistrar() { return mCommitCallbackRegistrar; }
|
CommitCallbackRegistry::ScopedRegistrar& getCommitCallbackRegistrar() { return mCommitCallbackRegistrar; }
|
||||||
EnableCallbackRegistry::ScopedRegistrar& getEnableCallbackRegistrar() { return mEnableCallbackRegistrar; }
|
EnableCallbackRegistry::ScopedRegistrar& getEnableCallbackRegistrar() { return mEnableCallbackRegistrar; }
|
||||||
BOOL initPanelXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
|
virtual BOOL initPanelXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
|
||||||
void initChildrenXML(LLXMLNodePtr node, LLUICtrlFactory* factory);
|
void initChildrenXML(LLXMLNodePtr node, LLUICtrlFactory* factory);
|
||||||
void setPanelParameters(LLXMLNodePtr node, LLView *parentp);
|
void setPanelParameters(LLXMLNodePtr node, LLView *parentp);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user