diff options
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 11 | ||||
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 2 | 
2 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index e4e9ed168b..c3aacd1c4f 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -49,6 +49,17 @@        <key>Value</key>        <real>300</real>      </map> +    <key>AckCollectTime</key> +    <map> +      <key>Comment</key> +      <string>Ack messages collection and grouping time</string> +      <key>Persist</key> +      <integer>1</integer> +      <key>Type</key> +      <string>F32</string> +      <key>Value</key> +      <real>0.1</real> +    </map>      <key>AdminMenu</key>      <map>        <key>Comment</key> diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 67007bc4cd..54c5d1b9f4 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -5378,7 +5378,7 @@ void LLAppViewer::idleNetwork()  		}  		// Handle per-frame message system processing. -		gMessageSystem->processAcks(); +		gMessageSystem->processAcks(gSavedSettings.getF32("AckCollectTime"));  #ifdef TIME_THROTTLE_MESSAGES  		if (total_time >= CheckMessagesMaxTime)  | 
