summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-04-11 13:45:43 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-04-11 13:45:43 -0400
commit9311cc89ea36139b454b36349f11162f72924df7 (patch)
tree37ba16776aa8536a8263ed078caf67a5b012c013
parent2310f31e0d954a6ac1eb69e452faca94a9a59075 (diff)
DRTVWR-434 - trivial code change to trigger TC rebuild, also slight improvement to a log message
-rw-r--r--indra/newview/llviewerassetstorage.cpp6
-rw-r--r--indra/newview/llvoavatar.cpp2
-rw-r--r--indra/test/test.cpp1
3 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp
index cb60337a7f..d95b104f5c 100644
--- a/indra/newview/llviewerassetstorage.cpp
+++ b/indra/newview/llviewerassetstorage.cpp
@@ -455,7 +455,7 @@ void LLViewerAssetStorage::assetRequestCoro(
if (!status)
{
// TODO asset-http: handle failures
- LL_DEBUGS("ViewerAsset") << "request failed, status " << status.toTerseString() << ", now what?" << LL_ENDL;
+ LL_DEBUGS("ViewerAsset") << "request failed, status " << status.toTerseString() << LL_ENDL;
result_code = LL_ERR_ASSET_REQUEST_FAILED;
ext_status = LL_EXSTAT_NONE;
}
@@ -468,7 +468,9 @@ void LLViewerAssetStorage::assetRequestCoro(
S32 size = raw.size();
if (size > 0)
{
- // This create-then-rename flow is modeled on LLTransferTargetVFile, which is what's used in the UDP case.
+ // This create-then-rename flow is modeled on
+ // LLTransferTargetVFile, which is what was used in the UDP
+ // case.
LLUUID temp_id;
temp_id.generate();
LLVFile vf(gAssetStorage->mVFS, temp_id, atype, LLVFile::WRITE);
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 8888879b8a..adbfb1831f 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -9381,4 +9381,4 @@ BOOL LLVOAvatar::isTextureVisible(LLAvatarAppearanceDefines::ETextureIndex type,
}
-
+x=2;
diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index e42374d56b..5bc39b74a6 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -684,4 +684,5 @@ int main(int argc, char **argv)
return retval;
//delete mycallback;
+
}