3 files changed, 14 insertions, 13 deletions
diff --git a/indra/llplugin/CMakeLists.txt b/indra/llplugin/CMakeLists.txt
index 2f28673c07..1353b7a458 100644
--- a/indra/llplugin/CMakeLists.txt
+++ b/indra/llplugin/CMakeLists.txt
@@ -68,18 +68,18 @@ add_subdirectory(slplugin)
 
 # Add tests
 if (LL_TESTS)
-	include(LLAddBuildTest)
-	# UNIT TESTS
-	SET(llplugin_TEST_SOURCE_FILES
-	  llplugincookiestore.cpp
-	  )
+    include(LLAddBuildTest)
+    # UNIT TESTS
+    SET(llplugin_TEST_SOURCE_FILES
+      llplugincookiestore.cpp
+      )
 
-	# llplugincookiestore has a dependency on curl, so we need to link the curl library into the test.
-	set_source_files_properties(
-	  llplugincookiestore.cpp
-	  PROPERTIES
-		LL_TEST_ADDITIONAL_LIBRARIES "${CURL_LIBRARIES}"
-	  )
+    # llplugincookiestore has a dependency on curl, so we need to link the curl library into the test.
+    set_source_files_properties(
+      llplugincookiestore.cpp
+      PROPERTIES
+        LL_TEST_ADDITIONAL_LIBRARIES "${CURL_LIBRARIES}"
+      )
 
-	LL_ADD_PROJECT_UNIT_TESTS(llplugin "${llplugin_TEST_SOURCE_FILES}")
+    LL_ADD_PROJECT_UNIT_TESTS(llplugin "${llplugin_TEST_SOURCE_FILES}")
 endif (LL_TESTS)
diff --git a/indra/llplugin/llpluginprocesschild.cpp b/indra/llplugin/llpluginprocesschild.cpp
index 0beb46d0e5..f8a282184e 100644
--- a/indra/llplugin/llpluginprocesschild.cpp
+++ b/indra/llplugin/llpluginprocesschild.cpp
@@ -410,7 +410,7 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message)
 			}
 			else if(message_name == "sleep_time")
 			{
-				mSleepTime = parsed.getValueReal("time");
+				mSleepTime = llmax(parsed.getValueReal("time"), 1.0 / 100.0); // clamp to maximum of 100Hz
 			}
 			else if(message_name == "crash")
 			{
diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp
index 315096d4fd..110fac0f23 100644
--- a/indra/llplugin/llpluginprocessparent.cpp
+++ b/indra/llplugin/llpluginprocessparent.cpp
@@ -927,6 +927,7 @@ void LLPluginProcessParent::receiveMessage(const LLPluginMessage &message)
 				}
 				
 				// Send initial sleep time
+				llassert_always(mSleepTime != 0.f);
 				setSleepTime(mSleepTime, true);			
 
 				setState(STATE_RUNNING);