-Screwed around with SSE2.
-Added ReleaseSSE2 as a build target. -LL_VECTORIZE is silly and breaks things... -Small little tweaks. I have not tested if the cmake alterations work under linux and darwin. Hollar if broken.
This commit is contained in:
@@ -357,7 +357,7 @@ LLPointer<LLIMInfo> llsd_to_im_info(const LLSD& im_info_sd)
|
||||
param_message["message"].asString(),
|
||||
param_message["id"].asUUID(),
|
||||
(U32) param_message["parent_estate_id"].asInteger(),
|
||||
im_info->mRegionID = param_message["region_id"].asUUID(),
|
||||
param_message["region_id"].asUUID(),
|
||||
ll_vector3_from_sd(param_message["position"]),
|
||||
param_message["data"],
|
||||
(U8) param_message["offline"].asInteger(),
|
||||
|
||||
@@ -403,6 +403,10 @@ LLTemplateParser::LLTemplateParser(LLTemplateTokenizer & tokens):
|
||||
{
|
||||
mMessages.push_back(templatep);
|
||||
}
|
||||
else
|
||||
{
|
||||
delete templatep;
|
||||
}
|
||||
}
|
||||
|
||||
if(!tokens.wantEOF())
|
||||
|
||||
@@ -963,6 +963,7 @@ std::ostream& operator<<(std::ostream& s, const LLNameValue &a)
|
||||
U64_to_str(*a.mNameValueReference.u64, u64_string, sizeof(u64_string));
|
||||
s << u64_string;
|
||||
}
|
||||
break;
|
||||
case NVT_VEC3:
|
||||
s << *(a.mNameValueReference.vec3);
|
||||
break;
|
||||
|
||||
@@ -42,6 +42,9 @@
|
||||
|
||||
LLPacketBuffer::LLPacketBuffer(const LLHost &host, const char *datap, const S32 size) : mHost(host)
|
||||
{
|
||||
mSize = 0;
|
||||
mData[0] = '!';
|
||||
|
||||
if (size > NET_BUFFER_SIZE)
|
||||
{
|
||||
llerrs << "Sending packet > " << NET_BUFFER_SIZE << " of size " << size << llendl;
|
||||
|
||||
@@ -98,7 +98,9 @@ std::string LLServiceBuilder::buildServiceURI(const std::string& service_name)
|
||||
{
|
||||
std::ostringstream service_url;
|
||||
// Find the service builder
|
||||
if(mServiceMap.find(service_name) != mServiceMap.end())
|
||||
std::map<std::string, std::string>::const_iterator it =
|
||||
mServiceMap.find(service_name);
|
||||
if(it != mServiceMap.end())
|
||||
{
|
||||
// construct the service builder url
|
||||
LLApp* app = LLApp::instance();
|
||||
@@ -119,7 +121,7 @@ std::string LLServiceBuilder::buildServiceURI(const std::string& service_name)
|
||||
}
|
||||
service_url << base_url.asString();
|
||||
}
|
||||
service_url << mServiceMap[service_name];
|
||||
service_url << it->second;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -326,7 +326,7 @@ void LLTemplateMessageBuilder::addData(const char *varname, const void *data, EM
|
||||
<< "(" << size << "). Clamping size and truncating data." << llendl;
|
||||
size = 255;
|
||||
char *truncate = (char *)data;
|
||||
truncate[255] = 0;
|
||||
truncate[254] = 0; // array size is 255 but the last element index is 254
|
||||
}
|
||||
|
||||
// no correct size for MVT_VARIABLE, instead we need to tell how many bytes the size will be encoded as
|
||||
@@ -737,10 +737,14 @@ static S32 buildBlock(U8* buffer, S32 buffer_size, const LLMessageBlock* templat
|
||||
}
|
||||
|
||||
--block_count;
|
||||
++block_iter;
|
||||
|
||||
if (block_iter != message_data->mMemberBlocks.end())
|
||||
{
|
||||
mbci = block_iter->second;
|
||||
++block_iter;
|
||||
if (block_iter != message_data->mMemberBlocks.end())
|
||||
{
|
||||
mbci = block_iter->second;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -144,6 +144,8 @@ LLPartSysCompressedPacket::LLPartSysCompressedPacket()
|
||||
mData[i] = '\0';
|
||||
}
|
||||
|
||||
mNumBytes = 0;
|
||||
|
||||
gSetInitDataDefaults(&mDefaults);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user