diff options
author | Don Kjer <don@lindenlab.com> | 2011-07-03 01:02:01 -0700 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-07-03 01:02:01 -0700 |
commit | ec402fad16a937a39f4b5df4fd9da12acd61d322 (patch) | |
tree | eb09fad51d25854bf17af410f27e7dc6b107fbfe /indra/newview/llviewerwindow.cpp | |
parent | cae0915ee612dc1fe966c82ef764535f07f9a3ac (diff) |
SH-1747 mesh-asset-dep -- uploaded objects have bad permissions, and SH-1975 Name of mesh is not loaded into mesh uploader floater. Also removed a lot of dead mesh uploader code.
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rw-r--r-- | indra/newview/llviewerwindow.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index b2fd802ae7..4e5ebb690f 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -747,10 +747,8 @@ public: { LLMeshUploadThread* thread = *iter; - addText(xpos, ypos, llformat("Mesh Upload -- price quote: %d:%d | upload: %d:%d | create: %d", - thread->mPendingConfirmations, thread->mUploadQ.size()+thread->mTextureQ.size(), - thread->mPendingUploads, thread->mConfirmedQ.size()+thread->mConfirmedTextureQ.size(), - thread->mInstanceQ.size())); + addText(xpos, ypos, llformat("Mesh Uploads: %d", + thread->mPendingUploads)); ypos += y_inc; } } |