Merge.

Fri, 30 Mar 2018 21:22:57 +0200

author
Nicky <sl.nicky.ml@googlemail.com>
date
Fri, 30 Mar 2018 21:22:57 +0200
changeset 55021
ee134eabc77d
parent 55020
fbc8fb983e06
parent 54988
703e7397c21b
child 55022
2020e2d4ee09
child 55023
e4efbd2da92d

Merge.

     1.1 --- a/indra/newview/app_settings/settings.xml	Fri Mar 30 21:29:47 2018 +0200
     1.2 +++ b/indra/newview/app_settings/settings.xml	Fri Mar 30 21:22:57 2018 +0200
     1.3 @@ -24591,6 +24591,17 @@
     1.4        <key>Value</key>
     1.5        <integer>1</integer>
     1.6      </map>
     1.7 +    <key>FSUseReadOfflineMsgsCap</key>
     1.8 +    <map>
     1.9 +      <key>Comment</key>
    1.10 +      <string>If enabled, use the ReadOfflineMsgsCap to request offline messages at login</string>
    1.11 +      <key>Persist</key>
    1.12 +      <integer>1</integer>
    1.13 +      <key>Type</key>
    1.14 +      <string>Boolean</string>
    1.15 +      <key>Value</key>
    1.16 +      <integer>0</integer>
    1.17 +    </map>
    1.18    </map>
    1.19  </llsd>
    1.20  
     2.1 --- a/indra/newview/llimprocessing.cpp	Fri Mar 30 21:29:47 2018 +0200
     2.2 +++ b/indra/newview/llimprocessing.cpp	Fri Mar 30 21:22:57 2018 +0200
     2.3 @@ -2082,7 +2082,7 @@
     2.4          // Auto-accepted inventory items may require the avatar object
     2.5          // to build a correct name.  Likewise, inventory offers from
     2.6          // muted avatars require the mute list to properly mute.
     2.7 -        if (cap_url.empty())
     2.8 +        if (cap_url.empty() && gSavedSettings.getBOOL("FSUseReadOfflineMsgsCap"))
     2.9          {
    2.10              requestOfflineMessagesLegacy();
    2.11          }

mercurial