Skip to content
Snippets Groups Projects
Commit 57e5841a authored by Nyx (Neal Orman)'s avatar Nyx (Neal Orman)
Browse files

Automated merge with https://hg.secondlife.com/mesh-development

parents 071e0339 48e2ec03
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/llmeshrepository.cpp
+ 2
− 2
View file @ 57e5841a
...@@ -1415,8 +1415,8 @@ LLMeshUploadThread::LLMeshUploadThread(LLMeshUploadThread::instance_list& data, ...@@ -1415,8 +1415,8 @@ LLMeshUploadThread::LLMeshUploadThread(LLMeshUploadThread::instance_list& data,
mUploadObjectAssetCapability = gAgent.getRegion()->getCapability("UploadObjectAsset"); mUploadObjectAssetCapability = gAgent.getRegion()->getCapability("UploadObjectAsset");
mNewInventoryCapability = gAgent.getRegion()->getCapability("NewFileAgentInventoryVariablePrice"); mNewInventoryCapability = gAgent.getRegion()->getCapability("NewFileAgentInventoryVariablePrice");
mUploadObjectAssetCapability = scrub_host_name(mUploadObjectAssetCapability); //mUploadObjectAssetCapability = scrub_host_name(mUploadObjectAssetCapability);
mNewInventoryCapability = scrub_host_name(mNewInventoryCapability); //mNewInventoryCapability = scrub_host_name(mNewInventoryCapability);
mOrigin += gAgent.getAtAxis() * scale.magVec(); mOrigin += gAgent.getAtAxis() * scale.magVec();
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment