Permalink
Browse files

Round two of fixes for 1.2.9.1

  • Loading branch information...
1 parent 5de5d6d commit 562e481278f7fddfbc9e2421534fa8e909bcc781 @Avian-IW Avian-IW committed Oct 10, 2011
@@ -60,7 +60,7 @@ BOOL LLTemplateMessageReader::readMessage(const U8* data,class LLHost const &)
}
BOOL gValidateMessage = FALSE;
-BOOL LLTemplateMessageReader::validateMessage(const U8*, S32 buffer_size, LLHost const &sender, bool trusted)
+BOOL LLTemplateMessageReader::validateMessage(const U8*, S32 buffer_size, LLHost const &sender, bool trusted, BOOL custom)
{
return gValidateMessage;
}
@@ -2670,7 +2670,7 @@ bool LLInventoryModel::loadFromFile(const std::string& filename,
file.close();
LLSD::array_iterator llsd_it = data.beginArray();
- for (llsd_it; llsd_it != data.endArray(); ++llsd_it)
+ for (; llsd_it != data.endArray(); ++llsd_it)
{
if ((*llsd_it).has("inv_category"))
{
@@ -1848,7 +1848,7 @@ bool LLTextureFetch::updateRequestPriority(const LLUUID& id, F32 priority)
//virtual
S32 LLTextureFetch::update(U32 max_time_ms)
{
- static LLCachedControl<F32> band_width("ThrottleBandwidthKBPS", 500.F);
+ static LLCachedControl<F64> band_width("ThrottleBandwidthKBPS", 500.F);
{
mNetworkQueueMutex.lock() ;

0 comments on commit 562e481

Please sign in to comment.