Fix for normals getting squished on consolidation.

Replaced some magic numbers with constants.
Switched up throttling of mesh upload HTTP posts to prevent overloading one capability at a time.
Added some feedback on upload progress via debug text.
Made debug text move with side panel (keep debug text from rendering on top of side panel).

1 files changed, 18 insertions, 2 deletions

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index fd59ea41b2..5c039c9f94 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -31,7 +31,6 @@
  */
 
 #include "llviewerprecompiledheaders.h"
-
 #include "llviewerwindow.h"
 
 #if LL_WINDOWS
@@ -45,6 +44,7 @@
 #include <algorithm>
 
 #include "llfloaterreg.h"
+#include "llmeshrepository.h"
 #include "llpanellogin.h"
 #include "llviewerkeyboard.h"
 #include "llviewermenu.h"
@@ -318,7 +318,7 @@ public:
 		mTextColor = LLColor4( 0.86f, 0.86f, 0.86f, 1.f );
 
 		// Draw stuff growing up from right lower corner of screen
-		U32 xpos = mWindow->getWindowWidthScaled() - 350;
+		U32 xpos = mWindow->getWorldViewWidthScaled() - 350;
 		U32 ypos = 64;
 		const U32 y_inc = 20;
 
@@ -583,6 +583,22 @@ public:
 				ypos += y_inc;
 			}
 		}
+
+		//temporary hack to give feedback on mesh upload progress
+		if (!gMeshRepo.mUploads.empty())
+		{
+			for (std::vector<LLMeshUploadThread*>::iterator iter = gMeshRepo.mUploads.begin(); 
+				iter != gMeshRepo.mUploads.end(); ++iter)
+			{
+				LLMeshUploadThread* thread = *iter;
+
+				addText(xpos, ypos, llformat("Mesh Upload -- price quote: %d:%d | upload: %d:%d | create: %d", 
+								thread->mPendingConfirmations, thread->mUploadQ.size(),
+								thread->mPendingUploads, thread->mConfirmedQ.size(),
+								thread->mCompletedQ.size()));
+				ypos += y_inc;
+			}
+		}
 	}
 
 	void draw()