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

Fix llui build

meow-7.2.2
Cinders 2013-06-26 18:11:11 -06:00
parent fdc006be1e
commit c7196a5d4d
8 changed files with 13 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llui/CMakeLists.txt
View File

@ -31,10 +31,6 @@ include_directories(SYSTEM
${LLCOMMON_SYSTEM_INCLUDE_DIRS}
${LLXML_SYSTEM_INCLUDE_DIRS}
)
include_directories(SYSTEM
${LLCOMMON_SYSTEM_INCLUDE_DIRS}
${LLXML_SYSTEM_INCLUDE_DIRS}
)
set(llui_SOURCE_FILES
llaccordionctrl.cpp

30
indra/llui/llfolderview.cpp
View File

@ -238,18 +238,11 @@ LLFolderView::LLFolderView(const Params& p)
mPopupMenuHandle = menu->getHandle();
mViewModelItem->openItem();
mFolderviewProxy = 0; // <FS:ND> FIRE-4702;
}
// Destroys the object
LLFolderView::~LLFolderView( void )
{
// <FS:ND> FIRE-4702;
if( mFolderviewProxy )
mFolderviewProxy->mFolderview = 0;
// </FS:ND>
closeRenamer();
// The release focus call can potentially call the
@ -368,7 +361,6 @@ void LLFolderView::addToSelectionList(LLFolderViewItem* item)
}
item->setIsCurSelection(TRUE);
mSelectedItems.push_back(item);
mSelectionChanged = true;
}
void LLFolderView::removeFromSelectionList(LLFolderViewItem* item)
@ -384,7 +376,6 @@ void LLFolderView::removeFromSelectionList(LLFolderViewItem* item)
if (*item_iter == item)
{
item_iter = mSelectedItems.erase(item_iter);
mSelectionChanged = true;
}
else
{
@ -494,13 +485,6 @@ BOOL LLFolderView::changeSelection(LLFolderViewItem* selection, BOOL selected)
static LLFastTimer::DeclareTimer FTM_SANITIZE_SELECTION("Sanitize Selection");
void LLFolderView::sanitizeSelection()
{
// Nicky D.; Only run this if mSelectionChanged actually changed since our last run of sanitizeSelection.
// sanitizeSelection is a very expensive operation for many items (n^2 is n items are selected). In fact it
// is a good candidate for further optimizations.
if( !mSelectionChanged )
return;
mSelectionChanged = false;
LLFastTimer _(FTM_SANITIZE_SELECTION);
// store off current item in case it is automatically deselected
// and we want to preserve context
@ -614,7 +598,6 @@ void LLFolderView::clearSelection()
}
mSelectedItems.clear();
mSelectionChanged = true;
}
std::set<LLFolderViewItem*> LLFolderView::getSelectionList() const
@ -1982,16 +1965,3 @@ S32 LLFolderView::getItemHeight()
}
return 0;
}
// <FS:ND> FIRE-4702;
void LLFolderView::FolderviewProxy::onItemsRemovalConfirmation(const LLSD& notification, const LLSD& response)
{
if( mFolderview )
{
mFolderview->mFolderviewProxy = 0;
mFolderview->onItemsRemovalConfirmation( notification, response);
}
delete this;
}
// </FS:ND>

22
indra/llui/llfolderview.h
View File

@ -83,7 +83,6 @@ protected:
class LLFolderView : public LLFolderViewFolder, public LLEditMenuHandler
{
bool mSelectionChanged;
public:
struct Params : public LLInitParam::Block<Params, LLFolderViewFolder::Params>
{
@ -317,27 +316,6 @@ public:
static F32 sAutoOpenTime;
LLTextBox* mStatusTextBox;
// <FS:ND> FIRE-4702; When displaying a confirmation dialog to delete items, don't pass
// this, but instead a new proxy objects. this can be destroyed if there is a
// race condition between displaying the confirmation dialog and this folderview
// being populated at the same time.
private:
struct FolderviewProxy
{
void onItemsRemovalConfirmation(const LLSD& notification, const LLSD& response);
LLFolderView *mFolderview;
};
friend struct FolderviewProxy;
FolderviewProxy *mFolderviewProxy;
// </FS:ND>
#if !LL_RELEASE_WITH_DEBUG_INFO && !LL_DEBUG // <FS:ND> To reduce memory load for users with huge inventory this member is not defined in LLFolderViewItem for those targets
std::string mStatusText;
#endif // </FS:ND>
};

52
indra/llui/llfolderviewitem.cpp
View File

@ -28,8 +28,6 @@
#include "llflashtimer.h"
#include "linden_common.h"
#include "../newview/aoengine.h" // ## Zi: Animation Overrider
#include "../newview/fslslbridge.h" //-TT Client LSL Bridge
#include "llfolderviewitem.h"
#include "llfolderview.h"
#include "llfolderviewmodel.h"
@ -40,8 +38,6 @@
#include "lltrans.h"
#include "llwindow.h"
//#include "llinventorypanel.h" <FS:TM> CHUI merge check
///----------------------------------------------------------------------------
/// Class LLFolderViewItem
///----------------------------------------------------------------------------
@ -118,11 +114,7 @@ LLFolderViewItem::Params::Params()
text_pad_right("text_pad_right", 0),
arrow_size("arrow_size", 0),
max_folder_item_overlap("max_folder_item_overlap", 0)
{
static LLCachedControl<S32> FolderViewItemHeight(gSavedSettings, "FSFolderViewItemHeight");
item_height = (S32)FolderViewItemHeight;
}
{ }
// Default constructor
LLFolderViewItem::LLFolderViewItem(const LLFolderViewItem::Params& p)
@ -867,23 +859,6 @@ void LLFolderViewItem::draw()
// </FS:Ansariel> Re-apply FIRE-6714: Don't move objects to trash during cut&paste
drawLabel(font, text_left, y, color, right_x);
// ## Zi: Animation Overrider
//--------------------------------------------------------------------------------//
// Draw "protected" indicator
//
if((mListener->getUUID()==AOEngine::instance().getAOFolder() && gSavedPerAccountSettings.getBOOL("ProtectAOFolders"))
//-TT Client LSL Bridge
||(mListener->getUUID()==FSLSLBridge::instance().getBridgeFolder() && gSavedPerAccountSettings.getBOOL("ProtectBridgeFolder"))
//-TT
)
{
std::string locked_string = " (" + LLTrans::getString("ProtectedFolder") + ") ";
font->renderUTF8(locked_string, 0, right_x, y, sProtectedColor,
LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
S32_MAX, S32_MAX, &right_x, FALSE);
}
// ## Zi: Animation Overrider
//--------------------------------------------------------------------------------//
// Draw label suffix
//
@ -925,31 +900,6 @@ bool LLFolderViewItem::isInSelection() const
{
return mIsSelected || (mParentFolder && mParentFolder->isInSelection());
}
// <FS:ND> Don't bother with unneeded tooltips in inventor
BOOL LLFolderViewItem::handleToolTip(S32 x, S32 y, MASK mask)
{
if( childrenHandleToolTip( x, y, mask ) )
return TRUE;
int nStart = ARROW_SIZE + TEXT_PAD + ICON_WIDTH + ICON_PAD + mIndentation;
int nWidth = getLabelFontForStyle(mLabelStyle)->getWidth(mLabel) + nStart;
if( getRoot()->getParentPanel()->getRect().getWidth() < nWidth ) // Label is truncated, display tooltip
{
setToolTip( mLabel );
return LLView::handleToolTip( x, y, mask );
}
else
setToolTip( LLStringExplicit("") );
// In case of root we always want to return TRUE, otherwise tooltip handling gets propagated one level up and we end with a tooltip like 'All Items'.
if( this == getRoot() )
return TRUE;
return FALSE;
}
// </FS:ND>

2
indra/llui/llmenugl.cpp
View File

@ -89,7 +89,7 @@ const U32 SEPARATOR_HEIGHT_PIXELS = 8;
const S32 TEAROFF_SEPARATOR_HEIGHT_PIXELS = 10;
const S32 MENU_ITEM_PADDING = 4;
//const std::string SEPARATOR_NAME("separator");
const std::string SEPARATOR_NAME("separator");
const std::string VERTICAL_SEPARATOR_LABEL( "|" );
const std::string LLMenuGL::BOOLEAN_TRUE_PREFIX( "\xE2\x9C\x94" ); // U+2714 HEAVY CHECK MARK

8
indra/llui/lltextbase.cpp
View File

@ -3107,7 +3107,7 @@ LLNormalTextSegment::LLNormalTextSegment( const LLColor4& color, S32 start, S32
mToken(NULL),
mEditor(editor)
{
mStyle = new LLStyle(LLStyle::Params().visible(is_visible).color(color).font(editor.getDefaultFont())); // [SL:KB] - Patch: Control-TextEditorFont
mStyle = new LLStyle(LLStyle::Params().visible(is_visible).color(color));
mFontHeight = mStyle->getFont()->getLineHeight();
}
@ -3550,12 +3550,6 @@ F32 LLLineBreakTextSegment::draw(S32 start, S32 end, S32 selection_start, S32 se
{
return draw_rect.mLeft;
}
// [SL:KB] - Patch: Control-TextEditorFont | Checked: 2012-01-10 (Catznip-3.2.1) | Added: Catznip-3.2.1
void LLLineBreakTextSegment::setStyle(LLStyleConstSP style)
{
mFontHeight = llceil(style->getFont()->getLineHeight());
}
// [/SL:KB]
LLImageTextSegment::LLImageTextSegment(LLStyleConstSP style,S32 pos,class LLTextBase& editor)
: LLTextSegment(pos,pos+1),

16
indra/llui/llui.cpp
View File

@ -103,7 +103,7 @@ static LLDefaultChildRegistry::Register<LLToolBarVertical> register_toolbar_vert
//
//<FS:TM> CHUI merge check
LLUUID find_ui_sound(const char * namep, BOOL forceSound) //LL post CHUI
LLUUID find_ui_sound(const char * namep, bool force_sound) //LL post CHUI
// <FS:PP> UI Sounds preview
// void make_ui_sound(const char* namep) //LL pre CHUI, LL moved make_ui_sound below and renamed this segment
// void make_ui_sound(const char* namep, BOOL forceSound) //Old
@ -138,8 +138,8 @@ LLUUID find_ui_sound(const char * namep, BOOL forceSound) //LL post CHUI
// <FS:PP> Silencer for FIRE-7556: Configurable User Interface sounds
if (name != "UISndNewIncomingIMSession" && name != "UISndNewIncomingGroupIMSession") // There is no need to process these two, checks are in llimview.cpp already, in LLIMMgr::addMessage
{
if (!forceSound && ( (name != "UISndSnapshot" && !LLUI::sSettingGroups["config"]->getBOOL("PlayMode"+name)) || (name == "UISndSnapshot" && LLUI::sSettingGroups["config"]->getBOOL("PlayModeUISndSnapshot")) ) )
return;
if (!force_sound && ( (name != "UISndSnapshot" && !LLUI::sSettingGroups["config"]->getBOOL("PlayMode"+name)) || (name == "UISndSnapshot" && LLUI::sSettingGroups["config"]->getBOOL("PlayModeUISndSnapshot")) ) )
return uuid;
}
// </FS:PP>
@ -153,18 +153,20 @@ LLUUID find_ui_sound(const char * namep, BOOL forceSound) //LL post CHUI
return uuid;
}
void make_ui_sound(const char* namep)
//void make_ui_sound(const char* namep)
void make_ui_sound(const char* namep, bool force_sound)
{
LLUUID soundUUID = find_ui_sound(namep);
LLUUID soundUUID = find_ui_sound(namep, force_sound);
if(soundUUID.notNull())
{
LLUI::sAudioCallback(soundUUID);
}
}
void make_ui_sound_deferred(const char* namep)
//void make_ui_sound_deferred(const char* namep)
void mame_ui_sound_deferred(const char* namep, bool force_sound)
{
LLUUID soundUUID = find_ui_sound(namep);
LLUUID soundUUID = find_ui_sound(namep, force_sound);
if(soundUUID.notNull())
{
LLUI::sDeferredAudioCallback(soundUUID);

2
indra/llui/llui.h
View File

@ -55,7 +55,7 @@ class LLHelp;
// <FS:PP> UI Sounds preview
// void make_ui_sound(const char* name);
void make_ui_sound(const char* name, bool forcesound = false);
void make_ui_sound(const char* name, bool force_sound = false);
// </FS:PP> UI Sounds preview
void make_ui_sound_deferred(const char * name); //<FS:TM> CHUI Merge check