4eae554812
Conflicts: indra/llappearance/llwearable.h indra/llui/llcombobox.h indra/newview/jcfloaterareasearch.cpp indra/newview/jcfloaterareasearch.h indra/newview/llpanelgrouproles.cpp indra/newview/llpanelgrouproles.h indra/newview/llviewermenu.cpp - Plugged in new MenuFloaterDict for AssetBlacklist and SoundExplorer in menu_viewer.xml and removed the old listeners for them. indra/newview/skins/default/xui/es/floater_inventory.xml Compile Fixes: indra/llcommon/llstl.h - error: expected nested-name-specifier before ‘const’ indra/llui/llmultisliderctrl.cpp:283:12: error: ‘caller’ was not declared in this scope indra/llui/lltexteditor.cpp - error: operands to ?: have different types ‘const LLPointer<LLTextSegment>’ and ‘long int’ - error: passing ‘const LLPointer<LLTextSegment>’ as ‘this’ argument of ‘LLPointer<Type>& LLPointer<Type>::operator=(const LLPointer<Type>&) [with Type = LLTextSegment]’ discards qualifiers indra/newview/llfloaterpermissionsmgr.cpp - Silly Shyotl, boost bind, not std bind. indra/newview/llfloaterproperties.* - error: ‘LLInstanceTracker<LLFloaterProperties, LLUUID>’ is an inaccessible base of ‘LLFloaterProperties’ indra/newview/llgivemoney.cpp - Again, boost::ref, not std::ref indra/newview/llpreviewscript.cpp - no known conversion for argument 1 from ‘std::vector<const LLPointer<LLTextSegment> >’ to ‘std::vector<LLPointer<LLTextSegment> >&
112 lines
3.3 KiB
C++
112 lines
3.3 KiB
C++
/**
|
|
* @file llfloaterproperties.h
|
|
* @brief A floater which shows an inventory item's properties.
|
|
*
|
|
* $LicenseInfo:firstyear=2002&license=viewergpl$
|
|
*
|
|
* Copyright (c) 2002-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_LLFLOATERPROPERTIES_H
|
|
#define LL_LLFLOATERPROPERTIES_H
|
|
|
|
#include <map>
|
|
#include "llmultifloater.h"
|
|
#include "lliconctrl.h"
|
|
#include "llinstancetracker.h"
|
|
#include "lluuid.h"
|
|
|
|
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
// Class LLFloaterProperties
|
|
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
|
class LLButton;
|
|
class LLCheckBoxCtrl;
|
|
class LLInventoryItem;
|
|
class LLLineEditor;
|
|
class LLRadioGroup;
|
|
class LLTextBox;
|
|
|
|
class LLPropertiesObserver;
|
|
|
|
class LLFloaterProperties : public LLFloater, public LLInstanceTracker<LLFloaterProperties, LLUUID>
|
|
{
|
|
public:
|
|
static LLFloaterProperties* find(const LLUUID& item_id,
|
|
const LLUUID& object_id);
|
|
static LLFloaterProperties* show(const LLUUID& item_id,
|
|
const LLUUID& object_id);
|
|
static void dirtyAll();
|
|
|
|
static void closeByID(const LLUUID& item_id, const LLUUID& object_id);
|
|
|
|
LLFloaterProperties(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_id, const LLUUID& object_id);
|
|
/*virtual*/ ~LLFloaterProperties();
|
|
/*virtual*/ BOOL postBuild();
|
|
/*virtual*/ void onOpen();
|
|
|
|
// do everything necessary
|
|
void dirty() { mDirty = TRUE; }
|
|
void refresh();
|
|
|
|
protected:
|
|
// ui callbacks
|
|
void onClickCreator();
|
|
void onClickOwner();
|
|
void onCommitName();
|
|
void onCommitDescription();
|
|
void onCommitPermissions();
|
|
void onCommitSaleInfo();
|
|
void onCommitSaleType();
|
|
void updateSaleInfo();
|
|
|
|
LLInventoryItem* findItem() const;
|
|
|
|
void refreshFromItem(LLInventoryItem* item);
|
|
virtual void draw();
|
|
|
|
protected:
|
|
// The item id of the inventory item in question.
|
|
LLUUID mItemID;
|
|
|
|
// mObjectID will have a value if it is associated with a task in
|
|
// the world, and will be == LLUUID::null if it's in the agent
|
|
// inventory.
|
|
LLUUID mObjectID;
|
|
|
|
BOOL mDirty;
|
|
|
|
LLPropertiesObserver* mPropertiesObserver;
|
|
};
|
|
|
|
class LLMultiProperties : public LLMultiFloater
|
|
{
|
|
public:
|
|
LLMultiProperties(const LLRect& rect);
|
|
};
|
|
|
|
#endif // LL_LLFLOATERPROPERTIES_H
|