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

Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer

master
Ansariel 2022-05-26 11:48:40 +02:00
parent 5cdd8cdb6e 91606c7b60
commit 7cc7b74778
5 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llcharacter/llkeyframemotion.cpp
View File

@ -1364,9 +1364,10 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
//SL-17206 hack to alter Female_land loop setting, while current behavior won't be changed serverside
LLUUID const female_land_anim("ca1baf4d-0a18-5a1f-0330-e4bd1e71f09e");
if (female_land_anim == asset_id)
LLUUID const formal_female_land_anim("6a9a173b-61fa-3ad5-01fa-a851cfc5f66a");
if (female_land_anim == asset_id || formal_female_land_anim == asset_id)
{
LL_WARNS() << "Animation(" << female_land_anim << ") won't be looped." << LL_ENDL;
LL_WARNS() << "Animation(" << asset_id << ") won't be looped." << LL_ENDL;
mJointMotionList->mLoop = FALSE;
}

1
indra/newview/app_settings/key_bindings.xml
View File

@ -85,7 +85,6 @@
<binding key="DOWN" mask="CTL_ALT_SHIFT" command="pan_down"/>
<binding key="" mask="NONE" mouse="MMB" command="toggle_voice"/>
<binding key="" mask="NONE" mouse="LMB" command="walk_to"/>
<binding key="" mask="NONE" mouse="LMB" command="script_trigger_lbutton"/>
</third_person>

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

@ -9564,7 +9564,10 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<!-- *HACK: On first run, set this to 0 for new users,
otherwise the default is 1 to maintain consistent experience
for existing users. Hardcoded in llnetmap.cpp -->
<integer>1</integer>
</map>
<key>MiniMapScale</key>
<map>

15
indra/newview/llinventorybridge.cpp
View File

@ -4178,7 +4178,20 @@ void LLFolderBridge::perform_pasteFromClipboard()
{
if (item && can_move_to_landmarks(item))
{
dropToFavorites(item);
if (LLClipboard::instance().isCutMode())
{
LLViewerInventoryItem* viitem = dynamic_cast<LLViewerInventoryItem*>(item);
llassert(viitem);
if (viitem)
{
//changeItemParent() implicity calls dirtyFilter
changeItemParent(model, viitem, parent_id, FALSE);
}
}
else
{
dropToFavorites(item);
}
}
}
else if (LLClipboard::instance().isCutMode())

7
indra/newview/llnetmap.cpp
View File

@ -145,6 +145,13 @@ LLNetMap::LLNetMap (const Params & p)
{
// <FS:Ansariel> Fixing borked minimap zoom level persistance
//mScale = gSavedSettings.getF32("MiniMapScale");
if (gAgent.isFirstLogin())
{
// *HACK: On first run, set this to false for new users, otherwise the
// default is true to maintain consistent experience for existing
// users.
gSavedSettings.setBOOL("MiniMapRotate", false);
}
//mPixelsPerMeter = mScale / REGION_WIDTH_METERS;
//mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS);
setScale(gSavedSettings.getF32("MiniMapScale"));