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

Sync with viewer-development

meow-7.2.2
Merov Linden 2010-08-24 12:44:02 -07:00
parent f6d0f9952b 98cc236503
commit 1de433aa8c
6 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
BuildParams
View File

@ -77,19 +77,8 @@ viewer-release.build_viewer_update_version_manager = true
# aimee
# ========================================
viewer-development-import.build_Linux = true
viewer-development-import_debug.build_Linux = false
viewer-development-import.build_Darwin = true
viewer-development-import_debug.build_Darwin = false
viewer-development-import.build_CYGWIN = true
viewer-development-import.build_CYGWIN_Debug = false
viewer-development-import.build_CYGWIN_RelWithDebInfo = false
viewer-development-import.build_CYGWIN_Release = true
viewer-development-import_debug.build_CYGWIN_Debug = true
viewer-development-import_debug.build_CYGWIN_RelWithDebInfo = true
viewer-development-import_debug.build_CYGWIN_Release = false
viewer-development-import.build_debug_release_separately = true
viewer-development-fixes.build_debug_release_separately = true
# =======================================
# brad

3
indra/llui/llflatlistview.cpp
View File

@ -87,6 +87,9 @@ bool LLFlatListView::addItem(LLPanel * item, const LLSD& value /*= LLUUID::null*
mItemsPanel->addChild(item);
break;
default:
LL_WARNS("") << "Unsupported position." << LL_ENDL;
delete new_pair;
return false;
break;
}

2
indra/llui/llflatlistview.h
View File

@ -54,6 +54,7 @@
*/
class LLFlatListView : public LLScrollContainer, public LLEditMenuHandler
{
LOG_CLASS(LLFlatListView);
public:
/**
@ -448,6 +449,7 @@ private:
*/
class LLFlatListViewEx : public LLFlatListView
{
LOG_CLASS(LLFlatListViewEx);
public:
struct Params : public LLInitParam::Block<Params, LLFlatListView::Params>
{

1
indra/newview/llinventoryitemslist.h
View File

@ -38,6 +38,7 @@ class LLViewerInventoryItem;
class LLInventoryItemsList : public LLFlatListViewEx
{
LOG_CLASS(LLInventoryItemsList);
public:
struct Params : public LLInitParam::Block<Params, LLFlatListViewEx::Params>
{

7
indra/newview/llvoicevivox.cpp
View File

@ -7111,6 +7111,13 @@ void LLVivoxProtocolParser::reset()
alias.clear();
numberOfAliases = 0;
applicationString.clear();
id = 0;
nameString.clear();
descriptionString.clear();
expirationDate = LLDate();
hasExpired = false;
fontType = 0;
fontStatus = 0;
}
//virtual

1
indra/newview/llwearableitemslist.h
View File

@ -384,6 +384,7 @@ private:
*/
class LLWearableItemsList : public LLInventoryItemsList
{
LOG_CLASS(LLWearableItemsList);
public:
/**
* Context menu.