Second Life viewer sources 1.23.0-RC

1 files changed, 18 insertions, 9 deletions

diff --git a/linden/indra/newview/llfloaterlagmeter.cpp b/linden/indra/newview/llfloaterlagmeter.cpp
index 2367c4d..91471ca 100644
--- a/linden/indra/newview/llfloaterlagmeter.cpp
+++ b/linden/indra/newview/llfloaterlagmeter.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -99,19 +100,15 @@ LLFloaterLagMeter::LLFloaterLagMeter(const LLSD& key)
         mMinWidth = atoi( config_string.c_str() );
 
         mStringArgs["[CLIENT_FRAME_RATE_CRITICAL]"] = getString("client_frame_rate_critical_fps");
-        mStringArgs["[CLIENT_FRAME_RATE_CRITICAL]"] = getString("client_frame_rate_critical_fps");
         mStringArgs["[CLIENT_FRAME_RATE_WARNING]"] = getString("client_frame_rate_warning_fps");
 
         mStringArgs["[NETWORK_PACKET_LOSS_CRITICAL]"] = getString("network_packet_loss_critical_pct");
-        mStringArgs["[NETWORK_PACKET_LOSS_CRITICAL]"] = getString("network_packet_loss_critical_pct");
         mStringArgs["[NETWORK_PACKET_LOSS_WARNING]"] = getString("network_packet_loss_warning_pct");
 
         mStringArgs["[NETWORK_PING_CRITICAL]"] = getString("network_ping_critical_ms");
-        mStringArgs["[NETWORK_PING_CRITICAL]"] = getString("network_ping_critical_ms");
         mStringArgs["[NETWORK_PING_WARNING]"] = getString("network_ping_warning_ms");
 
         mStringArgs["[SERVER_FRAME_RATE_CRITICAL]"] = getString("server_frame_rate_critical_fps");
-        mStringArgs["[SERVER_FRAME_RATE_CRITICAL]"] = getString("server_frame_rate_critical_fps");
         mStringArgs["[SERVER_FRAME_RATE_WARNING]"] = getString("server_frame_rate_warning_fps");
 
         childSetAction("minimize", onClickShrink, this);
@@ -201,6 +198,12 @@ void LLFloaterLagMeter::determineNetwork()
         bool find_cause_loss = false;
         bool find_cause_ping = false;
 
+        // *FIXME: We can't blame a large ping time on anything in
+        // particular if the frame rate is low, because a low frame
+        // rate is a sure recipe for crappy ping times right now until
+        // the network handlers are de-synched from the rendering.
+        F32 client_frame_time_ms = 1000.0f * LLViewerStats::getInstance()->mFPSStat.getMeanDuration();
+        
         if(packet_loss >= mNetworkPacketLossCritical)
         {
                 mNetworkButton->setImageUnselected(LAG_CRITICAL_IMAGE_NAME);
@@ -210,8 +213,11 @@ void LLFloaterLagMeter::determineNetwork()
         else if(ping_time >= mNetworkPingCritical)
         {
                 mNetworkButton->setImageUnselected(LAG_CRITICAL_IMAGE_NAME);
-                mNetworkText->setText( getString("network_ping_critical_msg", mStringArgs) );
-                find_cause_ping = true;
+                if (client_frame_time_ms < mNetworkPingCritical)
+                {
+                        mNetworkText->setText( getString("network_ping_critical_msg", mStringArgs) );
+                        find_cause_ping = true;
+                }
         }
         else if(packet_loss >= mNetworkPacketLossWarning)
         {
@@ -222,8 +228,11 @@ void LLFloaterLagMeter::determineNetwork()
         else if(ping_time >= mNetworkPingWarning)
         {
                 mNetworkButton->setImageUnselected(LAG_WARNING_IMAGE_NAME);
-                mNetworkText->setText( getString("network_ping_warning_msg", mStringArgs) );
-                find_cause_ping = true;
+                if (client_frame_time_ms < mNetworkPingWarning)
+                {
+                        mNetworkText->setText( getString("network_ping_warning_msg", mStringArgs) );
+                        find_cause_ping = true;
+                }
         }
         else
         {