Merge.

Thu, 29 Mar 2018 14:49:32 +0200

author
Nicky <sl.nicky.ml@googlemail.com>
date
Thu, 29 Mar 2018 14:49:32 +0200
changeset 55018
edeabc120a73
parent 55017
b8371c4a8e62
parent 54986
94a44fa17dba
child 55019
42be23a90391

Merge.

     1.1 --- a/indra/newview/app_settings/settings.xml	Thu Mar 29 13:16:04 2018 +0200
     1.2 +++ b/indra/newview/app_settings/settings.xml	Thu Mar 29 14:49:32 2018 +0200
     1.3 @@ -13828,6 +13828,19 @@
     1.4        <key>Value</key>
     1.5        <integer>1</integer>
     1.6      </map>
     1.7 +    <key>FSInternalShowNavbarFavoritesPanel</key>
     1.8 +    <map>
     1.9 +      <key>Comment</key>
    1.10 +      <string>Internal control to show/hide navigation bar favorites panel</string>
    1.11 +      <key>HideFromEditor</key>
    1.12 +      <integer>1</integer>
    1.13 +      <key>Persist</key>
    1.14 +      <integer>0</integer>
    1.15 +      <key>Type</key>
    1.16 +      <string>Boolean</string>
    1.17 +      <key>Value</key>
    1.18 +      <integer>1</integer>
    1.19 +    </map>
    1.20      <key>ShowNavbarNavigationPanel</key>
    1.21      <map>
    1.22        <key>Comment</key>
    1.23 @@ -13839,6 +13852,19 @@
    1.24        <key>Value</key>
    1.25        <integer>0</integer>
    1.26      </map>
    1.27 +    <key>FSInternalShowNavbarNavigationPanel</key>
    1.28 +    <map>
    1.29 +      <key>Comment</key>
    1.30 +      <string>Internal control to show/hide navigation bar navigation panel</string>
    1.31 +      <key>HideFromEditor</key>
    1.32 +      <integer>1</integer>
    1.33 +      <key>Persist</key>
    1.34 +      <integer>0</integer>
    1.35 +      <key>Type</key>
    1.36 +      <string>Boolean</string>
    1.37 +      <key>Value</key>
    1.38 +      <integer>0</integer>
    1.39 +    </map>
    1.40      <key>ShowMiniLocationPanel</key>
    1.41      <map>
    1.42        <key>Comment</key>
     2.1 --- a/indra/newview/chatbar_as_cmdline.cpp	Thu Mar 29 13:16:04 2018 +0200
     2.2 +++ b/indra/newview/chatbar_as_cmdline.cpp	Thu Mar 29 14:49:32 2018 +0200
     2.3 @@ -1708,7 +1708,7 @@
     2.4  void cmdline_tp2name(const std::string& target)
     2.5  {
     2.6  	LLUUID avkey = cmdline_partial_name2key(target);
     2.7 -	if (avkey.notNull())
     2.8 +	if (avkey.notNull() && avkey != gAgentID)
     2.9  	{
    2.10  		LLAvatarActions::teleportTo(avkey);
    2.11  	}
     3.1 --- a/indra/newview/fsradar.cpp	Thu Mar 29 13:16:04 2018 +0200
     3.2 +++ b/indra/newview/fsradar.cpp	Thu Mar 29 14:49:32 2018 +0200
     3.3 @@ -864,33 +864,35 @@
     3.4  		}
     3.5  		else
     3.6  		{
     3.7 -			// <FS:TS> FIRE-20862: Teleport the configured offset
     3.8 -			//	   toward the center of the region from the
     3.9 +			// <FS:TS> FIRE-20862: Teleport the configured offset toward the center of the region from the
    3.10  			//         avatar's reported position
    3.11  			LLViewerRegion* avreg = world->getRegionFromPosGlobal(avpos);
    3.12 -		        LLVector3d region_center = avreg->getCenterGlobal();
    3.13 -		        LLVector3d offset = avpos - region_center;
    3.14 -		        LLVector3d destination;
    3.15 -	        	F32 lateral_distance= gSavedSettings.getF32("FSTeleportToOffsetLateral");
    3.16 -	        	F32 vertical_distance= gSavedSettings.getF32("FSTeleportToOffsetVertical");
    3.17 -		        if (offset.normalize() != 0.f) // there's an actual offset
    3.18 -		        {
    3.19 -		        	if (lateral_distance > 0.0f)
    3.20 -		        	{
    3.21 -			        	offset *= lateral_distance;
    3.22 -			        	destination = avpos - offset;
    3.23 +			if (avreg)
    3.24 +			{
    3.25 +				LLVector3d region_center = avreg->getCenterGlobal();
    3.26 +				LLVector3d offset = avpos - region_center;
    3.27 +				LLVector3d destination;
    3.28 +				F32 lateral_distance = gSavedSettings.getF32("FSTeleportToOffsetLateral");
    3.29 +				F32 vertical_distance = gSavedSettings.getF32("FSTeleportToOffsetVertical");
    3.30 +				if (offset.normalize() != 0.f) // there's an actual offset
    3.31 +				{
    3.32 +					if (lateral_distance > 0.0f)
    3.33 +					{
    3.34 +						offset *= lateral_distance;
    3.35 +						destination = avpos - offset;
    3.36 +					}
    3.37 +					else
    3.38 +					{
    3.39 +						destination = avpos;
    3.40 +					}
    3.41  				}
    3.42 -				else
    3.43 +				else // the target is exactly at the center, so the offset is 0
    3.44  				{
    3.45 -					destination = avpos;
    3.46 +					destination = region_center + LLVector3d(0.f, lateral_distance, 0.f);
    3.47  				}
    3.48 +				destination.mdV[VZ] = avpos.mdV[VZ] + vertical_distance;
    3.49 +				gAgent.teleportViaLocation(destination);
    3.50  			}
    3.51 -			else // the target is exactly at the center, so the offset is 0
    3.52 -			{
    3.53 -				destination = region_center + LLVector3d(0.f, lateral_distance, 0.f);
    3.54 -			}
    3.55 -			destination.mdV[VZ] = avpos.mdV[VZ] + vertical_distance;
    3.56 -			gAgent.teleportViaLocation(destination);
    3.57  		}
    3.58  	}
    3.59  	else
     4.1 --- a/indra/newview/llstartup.cpp	Thu Mar 29 13:16:04 2018 +0200
     4.2 +++ b/indra/newview/llstartup.cpp	Thu Mar 29 14:49:32 2018 +0200
     4.3 @@ -650,6 +650,11 @@
     4.4  		gSavedSettings.setString("FSInternalSkinCurrentTheme", gSavedSettings.getString("FSSkinCurrentThemeReadableName"));
     4.5  		// </FS:Ansariel>
     4.6  
     4.7 +		// <FS:Ansariel> Notification not showing if hiding the UI
     4.8 +		gSavedSettings.setBOOL("FSInternalShowNavbarNavigationPanel", gSavedSettings.getBOOL("ShowNavbarNavigationPanel"));
     4.9 +		gSavedSettings.setBOOL("FSInternalShowNavbarFavoritesPanel", gSavedSettings.getBOOL("ShowNavbarFavoritesPanel"));
    4.10 +		// </FS:Ansariel>
    4.11 +
    4.12  		if (LLFeatureManager::getInstance()->isSafe())
    4.13  		{
    4.14  			LLNotificationsUtil::add("DisplaySetToSafe");
     5.1 --- a/indra/newview/llviewercontrol.cpp	Thu Mar 29 13:16:04 2018 +0200
     5.2 +++ b/indra/newview/llviewercontrol.cpp	Thu Mar 29 14:49:32 2018 +0200
     5.3 @@ -919,6 +919,14 @@
     5.4  }
     5.5  // </FS:Ansariel>
     5.6  
     5.7 +// <FS:Ansariel> Notification not showing if hiding the UI
     5.8 +void handleNavbarSettingsChanged()
     5.9 +{
    5.10 +	gSavedSettings.setBOOL("FSInternalShowNavbarNavigationPanel", gSavedSettings.getBOOL("ShowNavbarNavigationPanel"));
    5.11 +	gSavedSettings.setBOOL("FSInternalShowNavbarFavoritesPanel", gSavedSettings.getBOOL("ShowNavbarFavoritesPanel"));
    5.12 +}
    5.13 +// </FS:Ansariel>
    5.14 +
    5.15  // <FS:Ansariel> FIRE-20288: Option to render friends only
    5.16  void handleRenderFriendsOnlyChanged(const LLSD& newvalue)
    5.17  {
    5.18 @@ -1167,6 +1175,11 @@
    5.19  
    5.20  	// <FS:Ansariel> FIRE-20288: Option to render friends only
    5.21  	gSavedPerAccountSettings.getControl("FSRenderFriendsOnly")->getSignal()->connect(boost::bind(&handleRenderFriendsOnlyChanged, _2));
    5.22 +
    5.23 +	// <FS:Ansariel> Notification not showing if hiding the UI
    5.24 +	gSavedSettings.getControl("ShowNavbarFavoritesPanel")->getSignal()->connect(boost::bind(&handleNavbarSettingsChanged));
    5.25 +	gSavedSettings.getControl("ShowNavbarNavigationPanel")->getSignal()->connect(boost::bind(&handleNavbarSettingsChanged));
    5.26 +	// </FS:Ansariel>
    5.27  }
    5.28  
    5.29  #if TEST_CACHED_CONTROL
     6.1 --- a/indra/newview/llviewerwindow.cpp	Thu Mar 29 13:16:04 2018 +0200
     6.2 +++ b/indra/newview/llviewerwindow.cpp	Thu Mar 29 14:49:32 2018 +0200
     6.3 @@ -6854,6 +6854,9 @@
     6.4  
     6.5  	// <FS:Ansariel> Notification not showing if hiding the UI
     6.6  	FSNearbyChat::instance().showDefaultChatBar(visible && !gSavedSettings.getBOOL("AutohideChatBar"));
     6.7 +	gSavedSettings.setBOOL("FSInternalShowNavbarNavigationPanel", visible && gSavedSettings.getBOOL("ShowNavbarNavigationPanel"));
     6.8 +	gSavedSettings.setBOOL("FSInternalShowNavbarFavoritesPanel", visible && gSavedSettings.getBOOL("ShowNavbarFavoritesPanel"));
     6.9 +	// </FS:Ansariel>
    6.10  
    6.11  	// <FS:Zi> Is done inside XUI now, using visibility_control
    6.12  	//LLNavigationBar::getInstance()->setVisible(visible ? gSavedSettings.getBOOL("ShowNavbarNavigationPanel") : FALSE);
     7.1 --- a/indra/newview/llvoicevivox.cpp	Thu Mar 29 13:16:04 2018 +0200
     7.2 +++ b/indra/newview/llvoicevivox.cpp	Thu Mar 29 14:49:32 2018 +0200
     7.3 @@ -785,7 +785,10 @@
     7.4  bool LLVivoxVoiceClient::startAndLaunchDaemon()
     7.5  {
     7.6      //---------------------------------------------------------------------
     7.7 -    if (!voiceEnabled())
     7.8 +    // </FS:Ansariel> Bypass cached controls
     7.9 +    //if (!voiceEnabled())
    7.10 +    if (!voiceEnabled(true))
    7.11 +    // </FS:Ansariel>
    7.12      {
    7.13          // Voice is locked out, we must not launch the vivox daemon.
    7.14          return false;
     8.1 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml	Thu Mar 29 13:16:04 2018 +0200
     8.2 +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml	Thu Mar 29 14:49:32 2018 +0200
     8.3 @@ -33,7 +33,7 @@
     8.4   height="22"
     8.5   layout="topleft"
     8.6   name="navigation_bar_visibility_panel"
     8.7 - visibility_control="ShowNavbarNavigationPanel"
     8.8 + visibility_control="FSInternalShowNavbarNavigationPanel"
     8.9   auto_resize="false"
    8.10   width="1024">
    8.11  
    8.12 @@ -216,7 +216,7 @@
    8.13   height="15"
    8.14   layout="topleft"
    8.15   name="favorites_bar_visibility_panel"
    8.16 - visibility_control="ShowNavbarFavoritesPanel"
    8.17 + visibility_control="FSInternalShowNavbarFavoritesPanel"
    8.18   auto_resize="false">
    8.19  
    8.20    <favorites_bar
     9.1 --- a/indra/newview/skins/metaharper/xui/en/panel_navigation_bar.xml	Thu Mar 29 13:16:04 2018 +0200
     9.2 +++ b/indra/newview/skins/metaharper/xui/en/panel_navigation_bar.xml	Thu Mar 29 14:49:32 2018 +0200
     9.3 @@ -33,7 +33,7 @@
     9.4   height="22"
     9.5   layout="topleft"
     9.6   name="navigation_bar_visibility_panel"
     9.7 - visibility_control="ShowNavbarNavigationPanel"
     9.8 + visibility_control="FSInternalShowNavbarNavigationPanel"
     9.9   auto_resize="false"
    9.10   width="1024">
    9.11  
    9.12 @@ -216,7 +216,7 @@
    9.13   height="15"
    9.14   layout="topleft"
    9.15   name="favorites_bar_visibility_panel"
    9.16 - visibility_control="ShowNavbarFavoritesPanel"
    9.17 + visibility_control="FSInternalShowNavbarFavoritesPanel"
    9.18   auto_resize="true">
    9.19  
    9.20    <favorites_bar
    10.1 --- a/indra/newview/skins/starlight/xui/en/panel_navigation_bar.xml	Thu Mar 29 13:16:04 2018 +0200
    10.2 +++ b/indra/newview/skins/starlight/xui/en/panel_navigation_bar.xml	Thu Mar 29 14:49:32 2018 +0200
    10.3 @@ -36,7 +36,7 @@
    10.4   height="24"
    10.5   layout="topleft"
    10.6   name="navigation_bar_visibility_panel"
    10.7 - visibility_control="ShowNavbarNavigationPanel"
    10.8 + visibility_control="FSInternalShowNavbarNavigationPanel"
    10.9   width="1024"
   10.10   auto_resize="false">
   10.11  
   10.12 @@ -227,7 +227,7 @@
   10.13   height="15"
   10.14   layout="topleft"
   10.15   name="favorites_bar_visibility_panel"
   10.16 - visibility_control="ShowNavbarFavoritesPanel"
   10.17 + visibility_control="FSInternalShowNavbarFavoritesPanel"
   10.18   auto_resize="false">
   10.19  
   10.20    <favorites_bar
    11.1 --- a/indra/newview/skins/starlightcui/xui/en/panel_navigation_bar.xml	Thu Mar 29 13:16:04 2018 +0200
    11.2 +++ b/indra/newview/skins/starlightcui/xui/en/panel_navigation_bar.xml	Thu Mar 29 14:49:32 2018 +0200
    11.3 @@ -35,7 +35,7 @@
    11.4   height="24"
    11.5   layout="topleft"
    11.6   name="navigation_bar_visibility_panel"
    11.7 - visibility_control="ShowNavbarNavigationPanel"
    11.8 + visibility_control="FSInternalShowNavbarNavigationPanel"
    11.9   width="1024"
   11.10   auto_resize="false">
   11.11  
   11.12 @@ -225,7 +225,7 @@
   11.13   height="15"
   11.14   layout="topleft"
   11.15   name="favorites_bar_visibility_panel"
   11.16 - visibility_control="ShowNavbarFavoritesPanel"
   11.17 + visibility_control="FSInternalShowNavbarFavoritesPanel"
   11.18   auto_resize="false">
   11.19  
   11.20    <favorites_bar
    12.1 --- a/indra/newview/skins/vintage/xui/en/floater_fs_nearby_chat.xml	Thu Mar 29 13:16:04 2018 +0200
    12.2 +++ b/indra/newview/skins/vintage/xui/en/floater_fs_nearby_chat.xml	Thu Mar 29 14:49:32 2018 +0200
    12.3 @@ -28,13 +28,13 @@
    12.4      animate="false"
    12.5      follows="top|left"
    12.6      clip="false"
    12.7 -    height="9"
    12.8 +    height="27"
    12.9      width="200"
   12.10      left_pad="0"
   12.11      layout="topleft"
   12.12      orientation="horizontal"
   12.13      name="ls_control_panel"
   12.14 -    top="18"
   12.15 +    top="0"
   12.16      left="3">
   12.17      <layout_panel
   12.18        name="lp_translate_btn"

mercurial