summaryrefslogtreecommitdiff
path: root/indra/llplugin/llpluginprocesschild.cpp
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2011-08-18 19:17:34 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2011-08-18 19:17:34 -0400
commitcb09994ae2a3d1d60a6554fea4c6a604b867c6eb (patch)
tree676b7c68e0b0422c63e4cb6dbd5ccc1e55168e2f /indra/llplugin/llpluginprocesschild.cpp
parentcfe0a3cbe445900574b82e8c843bddc347f1b269 (diff)
parent299a01470402de0327fc7f839e5937fc6b60bf63 (diff)
merging in latest mesh-development
Diffstat (limited to 'indra/llplugin/llpluginprocesschild.cpp')
-rw-r--r--indra/llplugin/llpluginprocesschild.cpp2
1 files changed, 1 insertions, 1 deletions
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")
{