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

Merge Firestorm LGPL tip

meow-7.2.2
Ansariel 2018-01-05 20:55:43 +01:00
parent 1c11071f38 65097fa14e
commit 7450e1da87
29 changed files with 346 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/cmake/Variables.cmake
View File

@ -177,7 +177,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(CMAKE_OSX_SYSROOT macosx10.9)
message(STATUS "OS X SDK 10.9 found.")
else(IS_DIRECTORY "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk")
error("Unable to determine which OS X SDK to use. Giving up.")
message(FATAL_ERROR "Unable to determine which OS X SDK to use. Giving up.")
endif(IS_DIRECTORY "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk")
set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvm.clang.1_0")

5
indra/llui/llfolderviewitem.cpp
View File

@ -179,7 +179,10 @@ LLFolderViewItem::LLFolderViewItem(const LLFolderViewItem::Params& p)
sMouseOverColor = LLUIColorTable::instance().getColor("InventoryMouseOverColor", DEFAULT_WHITE);
sFilterBGColor = LLUIColorTable::instance().getColor("FilterBackgroundColor", DEFAULT_WHITE);
sFilterTextColor = LLUIColorTable::instance().getColor("FilterTextColor", DEFAULT_WHITE);
sSuffixColor = LLUIColorTable::instance().getColor("InventoryItemColor", DEFAULT_WHITE);
// <FS:Ansariel> Fix misleading color name
//sSuffixColor = LLUIColorTable::instance().getColor("InventoryItemColor", DEFAULT_WHITE);
sSuffixColor = LLUIColorTable::instance().getColor("InventoryItemSuffixColor", DEFAULT_WHITE);
// </FS:Ansariel>
sSearchStatusColor = LLUIColorTable::instance().getColor("InventorySearchStatusColor", DEFAULT_WHITE);
// <FS:Ansariel> Special for protected items
sProtectedColor = LLUIColorTable::instance().getColor("InventoryProtectedColor", DEFAULT_WHITE);

11
indra/newview/app_settings/settings.xml
View File

@ -24511,6 +24511,17 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>0</integer>
</map>
<key>FSAppearanceShowHints</key>
<map>
<key>Comment</key>
<string>If enabled, show visual hints (avatar images) in appearance editor</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
</map>
</llsd>

10
indra/newview/chatbar_as_cmdline.cpp
View File

@ -805,6 +805,16 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge
}
return false;
}
else if (command == "/zoffset_up")
{
gSavedPerAccountSettings.setF32("AvatarHoverOffsetZ", gSavedPerAccountSettings.getF32("AvatarHoverOffsetZ") + 0.05f);
return false;
}
else if (command == "/zoffset_down")
{
gSavedPerAccountSettings.setF32("AvatarHoverOffsetZ", gSavedPerAccountSettings.getF32("AvatarHoverOffsetZ") - 0.05f);
return false;
}
else if (command == sFSCmdLineOfferTp())
{
LLUUID target_key;

1
indra/newview/fonts/CelestiaMediumRedux-NOTICE.txt Normal file
View File

@ -0,0 +1 @@
This font is released into the Public Domain, so you can freely use it how you want, you can freely redistribute it, and you can freely modify it.

BIN
indra/newview/fonts/CelestiaMediumRedux1.55.ttf Normal file
View File

Binary file not shown.

189
indra/newview/fonts/fonts_celestia_medium_redux.xml Normal file
View File

@ -0,0 +1,189 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<fonts>
<font name="default" comment="default font files (global fallbacks)">
<file>CelestiaMediumRedux1.55.ttf</file>
<os name="Windows">
<file>YuGothR.ttc</file>
<file>MSGOTHIC.TTC</file>
<file>gulim.ttc</file>
<file>simhei.ttf</file>
<file>ArialUni.ttf</file>
<file>seguisym.ttf</file>
<file>nirmala.ttf</file>
<file>tahoma.ttf</file>
</os>
<os name="Mac">
<file>ヒラギノ角ゴシック W3.ttc</file>
<file>ヒラギノ角ゴ Pro W3.otf</file>
<file>ヒラギノ角ゴ ProN W3.otf</file>
<file>ヒラギノ明朝 ProN W3.ttc</file>
<!-- <FS:TS> FIRE-17481: Add El Capitan Korean font -->
<file>AppleSDGothicNeo.ttc</file>
<!-- </FS:TS> FIRE-17481 -->
<file>AppleGothic.dfont</file>
<file>AppleGothic.ttf</file>
<file>AppleSDGothicNeo-Regular.otf</file>
<file>华文细黑.ttf</file>
</os>
</font>
<font name="SansSerifBold"
comment="Name of bold sans-serif font">
<file>CelestiaMediumRedux1.55.ttf</file>
<os name="Windows">
<file>arialbd.ttf</file>
</os>
<os name="Mac">
<file>Helvetica.dfont</file>
</os>
</font>
<font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
<file>CelestiaMediumRedux1.55.ttf</file>
<os name="Windows">
<file>arial.ttf</file>
</os>
<os name="Mac">
<file>Helvetica.dfont</file>
</os>
</font>
<font name="SansSerif"
comment="Name of bold sans-serif font"
font_style="BOLD">
<file>CelestiaMediumRedux1.55.ttf</file>
</font>
<font name="SansSerif"
comment="Name of italic sans-serif font"
font_style="ITALIC">
<file>CelestiaMediumRedux1.55.ttf</file>
</font>
<font name="SansSerif"
comment="Name of bold italic sans-serif font"
font_style="BOLD|ITALIC">
<file>CelestiaMediumRedux1.55.ttf</file>
</font>
<font name="Monospace"
comment="Name of monospace font">
<file>DejaVuSansMono.ttf</file>
</font>
<font name="Scripting"
comment="Name of an optional font used for the script editor">
<file>SourceCodePro-Regular.ttf</file>
</font>
<font name="OCRA"
comment="OCRA machine character recognition used in script editor compile errors">
<file>ocra.ttf</file>
</font>
<font name="DejaVu"
comment="Name of DejaVu font">
<file>DejaVuSans.ttf</file>
</font>
<font name="DejaVu"
comment="Name of DejaVu font (bold)"
font_style="BOLD">
<file>DejaVuSans-Bold.ttf</file>
</font>
<font name="DejaVu"
comment="Name of DejaVu font (italic)"
font_style="ITALIC">
<file>DejaVuSans-Oblique.ttf</file>
</font>
<font name="DejaVu"
comment="Name of DejaVu font (bold italic)"
font_style="BOLD|ITALIC">
<file>DejaVuSans-BoldOblique.ttf</file>
</font>
<font name="Helvetica"
comment="Name of Helvetica font">
<file>DejaVuSans.ttf</file>
<os name="Windows">
<file>arial.ttf</file>
</os>
<os name="Mac">
<file>arial.ttf</file>
</os>
</font>
<font name="Helvetica"
comment="Name of Helvetica font (bold)"
font_style="BOLD">
<file>DejaVuSans-Bold.ttf</file>
<os name="Windows">
<file>arialbd.ttf</file>
</os>
<os name="Mac">
<file>arialbd.ttf</file>
</os>
</font>
<font name="Helvetica"
comment="Name of Helvetica font (italic)"
font_style="ITALIC">
<file>DejaVuSans-Oblique.ttf</file>
<os name="Windows">
<file>ariali.ttf</file>
</os>
<os name="Mac">
<file>ariali.ttf</file>
</os>
</font>
<font name="Helvetica"
comment="Name of Helvetica font (bold italic)"
font_style="BOLD|ITALIC">
<file>DejaVuSans-BoldOblique.ttf</file>
<os name="Windows">
<file>arialbi.ttf</file>
</os>
<os name="Mac">
<file>arialbi.ttf</file>
</os>
</font>
<font name="OverrideTest"
comment="Name of font to test overriding">
<file>times.ttf</file>
<file>DejaVuSans.ttf</file>
</font>
<font_size name="Scripting"
comment="Size of script editor font (points, or 1/72 of an inch)"
size="8.6"
/>
<font_size name="Monospace"
comment="Size for monospaced font (points, or 1/72 of an inch)"
size="8.0"
/>
<font_size name="Huge"
comment="Size of huge font (points, or 1/72 of an inch)"
size="17.8"
/>
<font_size name="Large"
comment="Size of large font (points, or 1/72 of an inch)"
size="12.4"
/>
<font_size name="Medium"
comment="Size of medium font (points, or 1/72 of an inch)"
size="10.4"
/>
<font_size name="Small"
comment="Size of small font (points, or 1/72 of an inch)"
size="9.4"
/>
<font_size name="Pie"
comment="Size of pie menu font (points, or 1/72 of an inch)"
size="8.1"
/>
</fonts>

24
indra/newview/fscommon.cpp
View File

@ -163,7 +163,7 @@ S32 FSCommon::secondsSinceEpochFromString(const std::string& format, const std::
void FSCommon::applyDefaultBuildPreferences(LLViewerObject* object)
{
if (!object)
if (!object || !object->getRegion())
{
return;
}
@ -173,28 +173,28 @@ void FSCommon::applyDefaultBuildPreferences(LLViewerObject* object)
texture_entry.setColor(gSavedSettings.getColor4("FSBuildPrefs_Color"));
texture_entry.setAlpha((100.f - gSavedSettings.getF32("FSBuildPrefs_Alpha")) / 100.f);
texture_entry.setGlow(gSavedSettings.getF32("FSBuildPrefs_Glow"));
if(gSavedSettings.getBOOL("FSBuildPrefs_FullBright"))
if (gSavedSettings.getBOOL("FSBuildPrefs_FullBright"))
{
texture_entry.setFullbright(TEM_FULLBRIGHT_MASK);
}
U8 shiny = 0; // Default none
std::string shininess = gSavedSettings.getString("FSBuildPrefs_Shiny");
if(shininess == "Low")
if (shininess == "Low")
{
shiny = 1;
}
else if(shininess == "Medium")
else if (shininess == "Medium")
{
shiny = 2;
}
else if(shininess == "High")
else if (shininess == "High")
{
shiny = 3;
}
texture_entry.setShiny(shiny);
for(U8 face = 0; face < object->getNumTEs(); face++)
for (U8 face = 0; face < object->getNumTEs(); face++)
{
object->setTE(face, texture_entry);
}
@ -234,10 +234,10 @@ void FSCommon::applyDefaultBuildPreferences(LLViewerObject* object)
{
gMessageSystem->newMessageFast(_PREHASH_ObjectPermissions);
gMessageSystem->nextBlockFast(_PREHASH_AgentData);
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgentID);
gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgentSessionID);
gMessageSystem->nextBlockFast(_PREHASH_HeaderData);
gMessageSystem->addBOOLFast(_PREHASH_Override, (BOOL)FALSE);
gMessageSystem->addBOOLFast(_PREHASH_Override, FALSE);
gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, object_local_id);
gMessageSystem->addU8Fast(_PREHASH_Field, PERM_NEXT_OWNER);
@ -258,13 +258,13 @@ void FSCommon::applyDefaultBuildPreferences(LLViewerObject* object)
gMessageSystem->newMessage(_PREHASH_ObjectFlagUpdate);
gMessageSystem->nextBlockFast(_PREHASH_AgentData);
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgentID);
gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgentSessionID);
gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, object_local_id);
gMessageSystem->addBOOLFast(_PREHASH_UsePhysics, gSavedSettings.getBOOL("FSBuildPrefs_Physical"));
gMessageSystem->addBOOL(_PREHASH_IsTemporary, gSavedSettings.getBOOL("FSBuildPrefs_Temporary"));
gMessageSystem->addBOOL(_PREHASH_IsPhantom, gSavedSettings.getBOOL("FSBuildPrefs_Phantom"));
gMessageSystem->addBOOL("CastsShadows", FALSE );
gMessageSystem->addBOOL("CastsShadows", FALSE);
gMessageSystem->sendReliable(object->getRegion()->getHost());
}

2
indra/newview/llfavoritesbar.cpp
View File

@ -895,7 +895,7 @@ void LLFavoritesBarCtrl::updateButtons()
return;
}
if(mGetPrevItems)
if(mGetPrevItems && gInventory.isCategoryComplete(mFavoriteFolderId))
{
for (LLInventoryModel::item_array_t::iterator it = mItems.begin(); it != mItems.end(); it++)
{

14
indra/newview/llfloaterpreference.cpp
View File

@ -689,12 +689,6 @@ BOOL LLFloaterPreference::postBuild()
//getChild<LLComboBox>("NearbyChatOptions")->setCommitCallback(boost::bind(&LLFloaterPreference::onNotificationsChange, this,"NearbyChatOptions"));
//getChild<LLComboBox>("ObjectIMOptions")->setCommitCallback(boost::bind(&LLFloaterPreference::onNotificationsChange, this,"ObjectIMOptions"));
// </FS:CR>
// <FS:Zi> Optional Edit Appearance Lighting
gSavedSettings.getControl("AppearanceCameraMovement")->getCommitSignal()->connect(boost::bind(&LLFloaterPreference::onAppearanceCameraChanged, this));
onAppearanceCameraChanged();
// </FS:Zi> Optional Edit Appearance Lighting
// if floater is opened before login set default localized do not disturb message
if (LLStartUp::getStartupState() < STATE_STARTED)
@ -889,14 +883,6 @@ void LLFloaterPreference::onDoNotDisturbResponseChanged()
// </FS:Ansariel>
}
// <FS:Zi> Optional Edit Appearance Lighting
void LLFloaterPreference::onAppearanceCameraChanged()
{
BOOL enable = gSavedSettings.getBOOL("AppearanceCameraMovement");
getChild<LLCheckBoxCtrl>("EditAppearanceLighting")->setEnabled(enable);
}
// </FS:Zi> Optional Edit Appearance Lighting
LLFloaterPreference::~LLFloaterPreference()
{
/* Dead code - "windowsize combo" is not in any of the skin files, except for the

7
indra/newview/llfloaterpreference.h
View File

@ -36,7 +36,6 @@
#include "llfloater.h"
#include "llavatarpropertiesprocessor.h"
#include "llconversationlog.h"
#include "lllineeditor.h" // <FS:CR>
#include "llsearcheditor.h"
namespace nd
@ -57,6 +56,7 @@ class LLSliderCtrl;
class LLSD;
class LLTextBox;
class LLComboBox;
class LLLineEditor;
typedef std::map<std::string, std::string> notifications_map;
@ -150,11 +150,6 @@ protected:
void updateClickActionControls();
// <FS:PP> updates UI Sounds controls depending on values from settings.xml
void updateUISoundsControls();
// <FS:Zi> Optional Edit Appearance Lighting
// make sure controls get greyed out or enabled when appearance camera movement is toggled
void onAppearanceCameraChanged();
// </FS:Zi> Optional Edit Appearance Lighting
//<FS:Kadah> Font Selection
void populateFontSelectionCombo();

4
indra/newview/llfloaterregioninfo.cpp
View File

@ -314,7 +314,7 @@ void LLFloaterRegionInfo::requestRegionInfo()
void LLFloaterRegionInfo::processEstateOwnerRequest(LLMessageSystem* msg,void**)
{
static LLDispatcher dispatch;
LLFloaterRegionInfo* floater = LLFloaterReg::getTypedInstance<LLFloaterRegionInfo>("region_info");
LLFloaterRegionInfo* floater = LLFloaterReg::findTypedInstance<LLFloaterRegionInfo>("region_info");
if(!floater)
{
return;
@ -350,7 +350,7 @@ void LLFloaterRegionInfo::processEstateOwnerRequest(LLMessageSystem* msg,void**)
void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
{
LLPanel* panel;
LLFloaterRegionInfo* floater = LLFloaterReg::getTypedInstance<LLFloaterRegionInfo>("region_info");
LLFloaterRegionInfo* floater = LLFloaterReg::findTypedInstance<LLFloaterRegionInfo>("region_info");
if(!floater)
{
return;

29
indra/newview/llinventorypanel.cpp
View File

@ -608,6 +608,7 @@ void LLInventoryPanel::modelChanged(U32 mask)
{
setSelection(item_id, FALSE);
}
updateFolderLabel(model_item->getParentUUID());
}
//////////////////////////////
@ -619,6 +620,7 @@ void LLInventoryPanel::modelChanged(U32 mask)
// Don't process the item if it is the root
if (old_parent)
{
LLFolderViewModelItemInventory* viewmodel_folder = static_cast<LLFolderViewModelItemInventory*>(old_parent->getViewModelItem());
LLFolderViewFolder* new_parent = (LLFolderViewFolder*)getItemByID(model_item->getParentUUID());
// Item has been moved.
if (old_parent != new_parent)
@ -636,6 +638,7 @@ void LLInventoryPanel::modelChanged(U32 mask)
setSelection(item_id, FALSE);
}
}
updateFolderLabel(model_item->getParentUUID());
}
else
{
@ -647,6 +650,10 @@ void LLInventoryPanel::modelChanged(U32 mask)
// doesn't include trash). Just remove the item's UI.
view_item->destroyView();
}
if(viewmodel_folder)
{
updateFolderLabel(viewmodel_folder->getUUID());
}
old_parent->getViewModelItem()->dirtyDescendantsFilter();
}
}
@ -664,6 +671,11 @@ void LLInventoryPanel::modelChanged(U32 mask)
if(parent)
{
parent->getViewModelItem()->dirtyDescendantsFilter();
LLFolderViewModelItemInventory* viewmodel_folder = static_cast<LLFolderViewModelItemInventory*>(parent->getViewModelItem());
if(viewmodel_folder)
{
updateFolderLabel(viewmodel_folder->getUUID());
}
}
}
}
@ -1234,6 +1246,23 @@ void LLInventoryPanel::onSelectionChange(const std::deque<LLFolderViewItem*>& it
}
void LLInventoryPanel::updateFolderLabel(const LLUUID& folder_id)
{
if(folder_id != mPreviousSelectedFolder) return;
LLFolderViewItem* folder_item = getItemByID(mPreviousSelectedFolder);
if(folder_item)
{
LLFolderBridge* bridge = (LLFolderBridge*)folder_item->getViewModelItem();
if(bridge)
{
bridge->clearDisplayName();
bridge->setShowDescendantsCount(true);
folder_item->refresh();
}
}
}
void LLInventoryPanel::doCreate(const LLSD& userdata)
{
// <FS:Ansariel> FIRE-20108: Can't create new folder in secondary inventory if view is filtered

2
indra/newview/llinventorypanel.h
View File

@ -218,6 +218,8 @@ public:
// <FS:Ansariel> Optional hiding of Inbox folder
void updateShowInboxFolder(const LLSD &data);
void updateFolderLabel(const LLUUID& folder_id);
// DEBUG ONLY:
static void dumpSelectionInformation(void* user_data);

8
indra/newview/llpaneleditwearable.cpp
View File

@ -1634,6 +1634,9 @@ void LLPanelEditWearable::getSortedParams(value_map_t &sorted_params, const std:
void LLPanelEditWearable::buildParamList(LLScrollingPanelList *panel_list, value_map_t &sorted_params, LLAccordionCtrlTab *tab, LLJoint* jointp)
{
// <FS:Ansariel> FIRE-21936: Option to disable visual hints for appearance editor
BOOL show_hints = gSavedSettings.getBOOL("FSAppearanceShowHints");
// sorted_params is sorted according to magnitude of effect from
// least to greatest. Adding to the front of the child list
// reverses that order.
@ -1647,7 +1650,10 @@ void LLPanelEditWearable::buildParamList(LLScrollingPanelList *panel_list, value
p.name("LLScrollingPanelParam");
LLViewerWearable *wearable = this->getWearable();
LLScrollingPanelParamBase *panel_param = NULL;
if (wearable && wearable->getType() == LLWearableType::WT_PHYSICS) // Hack to show a different panel for physics. Should generalize this later.
// <FS:Ansariel> FIRE-21936: Option to disable visual hints for appearance editor
//if (wearable && wearable->getType() == LLWearableType::WT_PHYSICS) // Hack to show a different panel for physics. Should generalize this later.
if (!show_hints || (wearable && wearable->getType() == LLWearableType::WT_PHYSICS)) // Hack to show a different panel for physics. Should generalize this later.
// </FS:Ansariel>
{
panel_param = new LLScrollingPanelParamBase( p, NULL, (*it).second, TRUE, this->getWearable(), jointp);
}

3
indra/newview/llpanelgrouproles.cpp
View File

@ -3099,7 +3099,8 @@ BOOL LLPanelGroupBanListSubTab::postBuildSubTab(LLView* root)
// <FS:Ansariel> Fix Baker's NameListCtrl un-fix
//mBanList->setOnNameListCompleteCallback(boost::bind(&LLPanelGroupBanListSubTab::onBanListCompleted, this, _1));
populateBanList();
// <FS:Ansariel> Don't do this - it will cause populateBanList() being called twice because activate() is being called when switching to a tab, also calling populateBanList()
//populateBanList();
setFooterEnabled(FALSE);
return TRUE;

13
indra/newview/llpanelmarketplaceinbox.cpp
View File

@ -69,11 +69,17 @@ BOOL LLPanelMarketplaceInbox::postBuild()
return TRUE;
}
void LLPanelMarketplaceInbox::onSelectionChange()
// <FS:Ansariel> FIRE-21948: Show element count in Received Items folder
//void LLPanelMarketplaceInbox::onSelectionChange()
void LLPanelMarketplaceInbox::onSelectionChange(const std::deque<LLFolderViewItem*>& items, BOOL user_action)
// </FS:Ansariel>
{
LLSidepanelInventory* sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory");
sidepanel_inventory->updateVerbs();
// <FS:Ansariel> FIRE-21948: Show element count in Received Items folder
mInventoryPanel->onSelectionChange(items, user_action);
}
@ -98,7 +104,10 @@ LLInventoryPanel * LLPanelMarketplaceInbox::setupInventoryPanel()
mInventoryPanel->getFilter().markDefault();
// Set selection callback for proper update of inventory status buttons
mInventoryPanel->setSelectCallback(boost::bind(&LLPanelMarketplaceInbox::onSelectionChange, this));
// <FS:Ansariel> FIRE-21948: Show element count in Received Items folder
//mInventoryPanel->setSelectCallback(boost::bind(&LLPanelMarketplaceInbox::onSelectionChange, this));
mInventoryPanel->setSelectCallback(boost::bind(&LLPanelMarketplaceInbox::onSelectionChange, this, _1, _2));
// </FS:Ansariel>
// Set up the note to display when the inbox is empty
mInventoryPanel->getFilter().setEmptyLookupMessage("InventoryInboxNoItems");

6
indra/newview/llpanelmarketplaceinbox.h
View File

@ -28,6 +28,7 @@
#define LL_LLPANELMARKETPLACEINBOX_H
#include "llpanel.h"
#include "llfolderview.h"
class LLButton;
class LLInventoryPanel;
@ -63,7 +64,10 @@ public:
private:
void onSelectionChange();
// <FS:Ansariel> FIRE-21948: Show element count in Received Items folder
//void onSelectionChange();
void onSelectionChange(const std::deque<LLFolderViewItem*>& items, BOOL user_action);
// </FS:Ansariel>
void onFocusReceived();

20
indra/newview/llsurfacepatch.cpp
View File

@ -1004,14 +1004,26 @@ void LLSurfacePatch::updateVisibility()
if (mVObjp)
{
mVObjp->dirtyGeom();
if (getNeighborPatch(WEST))
// <FS:Ansariel> FIRE-19720: Crash when teleporting on Littlefield grid - LLVOSurfacePatch::dirtyGeom()
//if (getNeighborPatch(WEST))
//{
// getNeighborPatch(WEST)->mVObjp->dirtyGeom();
//}
//if (getNeighborPatch(SOUTH))
//{
// getNeighborPatch(SOUTH)->mVObjp->dirtyGeom();
//}
LLSurfacePatch* neighbor = getNeighborPatch(WEST);
if (neighbor && neighbor->mVObjp.notNull())
{
getNeighborPatch(WEST)->mVObjp->dirtyGeom();
neighbor->mVObjp->dirtyGeom();
}
if (getNeighborPatch(SOUTH))
neighbor = getNeighborPatch(SOUTH);
if (neighbor && neighbor->mVObjp.notNull())
{
getNeighborPatch(SOUTH)->mVObjp->dirtyGeom();
neighbor->mVObjp->dirtyGeom();
}
// </FS:Ansariel>
}
}
mVisInfo.mbIsVisible = TRUE;

2
indra/newview/llvovolume.cpp
View File

@ -743,7 +743,7 @@ void LLVOVolume::updateTextures()
if (mDrawable.notNull() && !isVisible() && !mDrawable->isActive())
{ //delete vertex buffer to free up some VRAM
LLSpatialGroup* group = mDrawable->getSpatialGroup();
if (group)
if (group && (group->mVertexBuffer.notNull() || !group->mBufferMap.empty() || !group->mDrawMap.empty()))
{
group->destroyGL(true);

6
indra/newview/skins/ansastorm/colors.xml
View File

@ -70,6 +70,9 @@
<color
name="LtGray_50"
value="0.90 0.90 0.90 0.50" />
<color
name="LtGray_75"
value="0.90 0.90 0.90 0.75" />
<color
name="Gray"
value="0.5 0.5 0.5 1" />
@ -756,6 +759,9 @@
<color
name="InventoryItemEnabledColor"
reference="LtGray" />
<color
name="InventoryItemSuffixColor"
reference="LtGray_75" />
<color
name="InventoryItemHighlightBgColor"
reference="AnsaStormBlue_Lt_13" />

6
indra/newview/skins/ansastorm/themes/classic_brown/colors.xml
View File

@ -70,6 +70,9 @@
<color
name="LtGray_50"
value="0.90 0.90 0.90 0.50" />
<color
name="LtGray_75"
value="0.90 0.90 0.90 0.75" />
<color
name="Gray"
value="0.5 0.5 0.5 1" />
@ -756,6 +759,9 @@
<color
name="InventoryItemEnabledColor"
reference="LtGray" />
<color
name="InventoryItemSuffixColor"
reference="LtGray_75" />
<color
name="InventoryItemHighlightBgColor"
reference="SchemeLightest_35" />

6
indra/newview/skins/default/colors.xml
View File

@ -70,6 +70,9 @@
<color
name="LtGray_50"
value="0.90 0.90 0.90 0.50" />
<color
name="LtGray_75"
value="0.90 0.90 0.90 0.75" />
<color
name="Gray"
value="0.5 0.5 0.5 1" />
@ -696,6 +699,9 @@
<color
name="InventoryItemEnabledColor"
reference="LtGray" />
<color
name="InventoryItemSuffixColor"
reference="LtGray_75" />
<color
name="InventoryItemHighlightBgColor"
reference="SchemeLightest_35" />

3
indra/newview/skins/default/xui/de/panel_preferences_move.xml
View File

@ -14,7 +14,8 @@
</text>
<check_box label="Bauen/Bearbeiten" name="edit_camera_movement" tool_tip="Automatische Kamerapositionierung bei Wechsel in und aus dem Bearbeitungsmodus verwenden"/>
<check_box label="Aussehen" name="appearance_camera_movement" tool_tip="Automatische Kamerapositionierung im Bearbeitenmodus verwenden"/>
<check_box label="Zusätzliche Beleuchtung aktivieren" name="EditAppearanceLighting" tool_tip="Aktiviert die zusätzliche Beleuchtung, wenn die Form des Avatars bearbeitet wird."/>
<check_box label="Zusätzliche Beleuchtung" name="EditAppearanceLighting" tool_tip="Aktiviert die zusätzliche Beleuchtung, wenn die Form des Avatars bearbeitet wird."/>
<check_box label="Visuelle Hilfen" name="FSAppearanceShowHints" tool_tip="Aktiviert die visuellen Hilfen, die die Teile des Avatars anzeigen, die modifiziert werden."/>
<check_box label="Klick auf Avatar hält Kameraposition" name="clickonavatarkeepscamera" tool_tip="Normalerweise wird die Kameraposition beim Anklicken des Avatars zurückgesetzt. Diese Option verhindert dieses Verhalten."/>
<check_box label="Kameraposition nach Teleport zurücksetzen (innerhalb einer Region)" name="FSResetCameraOnTP" tool_tip="Normalerweise wird die Kameraposition beim Teleportieren zurückgesetzt. Diese Option verhindert dieses Verhalten."/>
<check_box label="Kameraposition bei Avatarbewegung zurücksetzen" name="FSResetCameraOnMovement"/>

13
indra/newview/skins/default/xui/en/panel_preferences_move.xml
View File

@ -148,7 +148,7 @@
follows="left|top"
label="Build/Edit"
layout="topleft"
left_delta="30"
left_delta="10"
name="edit_camera_movement"
tool_tip="Use automatic camera positioning when entering and exiting edit mode"
width="280"
@ -163,6 +163,7 @@
tool_tip="Use automatic camera positioning while in edit mode"
width="100" />
<check_box
enabled_control="AppearanceCameraMovement"
control_name="EditAppearanceLighting"
follows="left|top"
height="16"
@ -172,6 +173,16 @@
name="EditAppearanceLighting"
tool_tip="Enable or disable the additional lighting used while editing avatar appearance."
width="150" />
<check_box
control_name="FSAppearanceShowHints"
follows="left|top"
height="16"
label="Show Visual Hints"
layout="topleft"
left_pad="10"
name="FSAppearanceShowHints"
tool_tip="Enable or disable the visual hints showing the avatar parts being modified."
width="150" />
<check_box
top_pad="10"

2
indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml
View File

@ -9,7 +9,7 @@
can_edit_text="true"
decimal_digits="0"
enabled="false"
height="12"
height="16"
increment="1"
initial_value="0"
label="[DESC]"

1
indra/newview/skins/default/xui/en/strings.xml
View File

@ -3068,6 +3068,7 @@ Try enclosing path to the editor with double quotes.
<string name="font_fonts_dyslexia.xml">OpenDyslexic</string>
<string name="font_fonts_deja_vu_all_caps.xml">Deja Vu All Caps</string>
<string name="font_fonts_noto.xml">Noto Sans</string>
<string name="font_fonts_celestia_medium_redux.xml">Celestia Medium Redux</string>
<string name="mode_unknown">Unknown Mode</string>
<string name="mode_settings_firestorm.xml">Firestorm</string>
<string name="mode_settings_phoenix.xml">Phoenix</string>

1
indra/newview/skins/default/xui/pl/panel_preferences_move.xml
View File

@ -14,6 +14,7 @@
<check_box label="Budowanie/Edycja" name="edit_camera_movement" tool_tip="Używaj automatycznego pozycjonowania kamery podczas włączania i wyłączania trybu edycji."/>
<check_box label="Wygląd" name="appearance_camera_movement" tool_tip="Używaj automatycznego pozycjonowania kamery podczas trybu edycji wyglądu."/>
<check_box label="Dodawaj dodatkowe oświetlenie" name="EditAppearanceLighting" tool_tip="Włącz lub wyłącz dodatkowe oświetlenie, gdy edytujesz wygląd."/>
<check_box label="Pokazuj wskazówki wizualne" name="FSAppearanceShowHints" tool_tip="Włącz lub wyłącz wskazówki wizualne pokazujące które sekcje awatara są modyfikowane." />
<check_box label="Nie resetuj kamery, gdy kliknę na swojego awatara" name="clickonavatarkeepscamera" tool_tip="Normalnie gdy klikniesz na swojego awatara pozycja kamery ulega zresetowaniu. Ta opcja usuwa to zachowanie."/>
<check_box label="Resetowanie pozycji kamery po teleportacji (wewnątrz regionu)" name="FSResetCameraOnTP" tool_tip="Normalnie pozycja kamery ulega zresetowaniu po teleportacji. Ta opcja zapobiega temu zachowaniu."/>
<check_box label="Resetowanie pozycji kamery przy poruszaniu się awatarem" name="FSResetCameraOnMovement"/>

6
indra/newview/skins/firestorm/colors.xml
View File

@ -67,6 +67,9 @@
<color
name="LtGray_50"
value="0.90 0.90 0.90 0.50" />
<color
name="LtGray_75"
value="0.90 0.90 0.90 0.75" />
<color
name="DkGray"
value="0.125 0.125 0.125 1" />
@ -552,6 +555,9 @@
<color
name="InventoryItemEnabledColor"
reference="LtGray" />
<color
name="InventoryItemSuffixColor"
reference="LtGray_75" />
<color
name="InventoryItemHighlightBgColor"
reference="SchemeLightest_35" />