From 71baa9cdf4d74a7ab1d194b4f823416f5f450c39 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Thu, 11 Sep 2014 18:50:26 +0300
Subject: MAINT-4440 FIXED Bad colors for spillover menu in viewer-lion

---
 indra/llui/llmenugl.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index d3ed4a1286..3e6002e546 100755
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -2369,7 +2369,9 @@ void LLMenuGL::createSpilloverBranch()
 		branch_params.label = label;
 		branch_params.branch = mSpilloverMenu;
 		branch_params.font.style = "italic";
-
+		branch_params.highlight_bg_color=LLUIColorTable::instance().getColor("MenuItemHighlightBgColor");
+		branch_params.highlight_fg_color=LLUIColorTable::instance().getColor("MenuItemHighlightFgColor");
+		branch_params.enabled_color=LLUIColorTable::instance().getColor("MenuItemEnabledColor");
 
 		mSpilloverBranch = LLUICtrlFactory::create<LLMenuItemBranchGL>(branch_params);
 	}
-- 
cgit v1.2.3


From 7615008efa39786aabf35b13e9717ff5651f43ff Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Thu, 11 Sep 2014 17:31:15 +0300
Subject: MAINT-4415 FIXED Speak button does not become enabled after enabling
 voice on parcel, if voice was disabled upon parcel entry

---
 indra/newview/llviewerparcelmgr.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 7c94442f09..2f4365036c 100755
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -1562,6 +1562,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
 
 		if (parcel == parcel_mgr.mAgentParcel)
 		{
+			// new agent parcel
 			S32 bitmap_size =	parcel_mgr.mParcelsPerEdge
 								* parcel_mgr.mParcelsPerEdge
 								/ 8;
@@ -1591,6 +1592,11 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
 				}
 			}
 		}
+		else if (local_id == parcel_mgr.mAgentParcel->getLocalID())
+		{
+			// updated agent parcel
+			parcel_mgr.mAgentParcel->unpackMessage(msg);
+		}
 	}
 
 	// Handle updating selections, if necessary.
-- 
cgit v1.2.3


From b75d2f7c3f955ce98064e688e61f5fdf785b1ed8 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Fri, 12 Sep 2014 11:30:52 +0300
Subject: MAINT-3666 FIXED Update modifiers when viewer window becomes key
 window

---
 indra/llwindow/llopenglview-objc.mm | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra')

diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index 1b5804ec83..06b96dd1ea 100644
--- a/indra/llwindow/llopenglview-objc.mm
+++ b/indra/llwindow/llopenglview-objc.mm
@@ -133,6 +133,10 @@ attributedStringInfo getSegments(NSAttributedString *str)
     [[NSNotificationCenter defaultCenter] addObserver:self
 											 selector:@selector(windowDidDeminiaturize:) name:NSWindowDidDeminiaturizeNotification
 											   object:[self window]];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self
+											 selector:@selector(windowDidBecomeKey:) name:NSWindowDidBecomeKeyNotification
+											   object:[self window]];
 }
 
 - (void)setOldResize:(bool)oldresize
@@ -159,6 +163,11 @@ attributedStringInfo getSegments(NSAttributedString *str)
     callWindowUnhide();
 }
 
+- (void)windowDidBecomeKey:(NSNotification *)notification;
+{
+    mModifiers = [NSEvent modifierFlags];
+}
+
 - (void)dealloc
 {
 	[[NSNotificationCenter defaultCenter] removeObserver:self];
-- 
cgit v1.2.3


From f1d2a1a4957ff6ee76d98f307bd682a36fe94038 Mon Sep 17 00:00:00 2001
From: ruslantproductengine <ruslantproductengine@lindenlab.com>
Date: Mon, 15 Sep 2014 20:26:28 +0300
Subject: MAINT-3562 FIXED Viewer crashes when updating local textures using
 Substance Designer : add code for control input buffer size

---
 indra/llimage/llimagepng.cpp   | 4 ++--
 indra/llimage/llpngwrapper.cpp | 9 ++++++++-
 indra/llimage/llpngwrapper.h   | 3 ++-
 3 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/llimage/llimagepng.cpp b/indra/llimage/llimagepng.cpp
index 294f68b122..7735dc1379 100755
--- a/indra/llimage/llimagepng.cpp
+++ b/indra/llimage/llimagepng.cpp
@@ -67,7 +67,7 @@ BOOL LLImagePNG::updateData()
 	}
 
 	LLPngWrapper::ImageInfo infop;
-	if (! pngWrapper.readPng(getData(), NULL, &infop))
+	if (! pngWrapper.readPng(getData(), getDataSize(), NULL, &infop))
 	{
 		setLastError(pngWrapper.getErrorMessage());
 		return FALSE;
@@ -102,7 +102,7 @@ BOOL LLImagePNG::decode(LLImageRaw* raw_image, F32 decode_time)
 		return FALSE;
 	}
 
-	if (! pngWrapper.readPng(getData(), raw_image))
+	if (! pngWrapper.readPng(getData(), getDataSize(), raw_image))
 	{
 		setLastError(pngWrapper.getErrorMessage());
 		return FALSE;
diff --git a/indra/llimage/llpngwrapper.cpp b/indra/llimage/llpngwrapper.cpp
index 2cc7d3c460..aad139f570 100755
--- a/indra/llimage/llpngwrapper.cpp
+++ b/indra/llimage/llpngwrapper.cpp
@@ -87,6 +87,12 @@ void LLPngWrapper::errorHandler(png_structp png_ptr, png_const_charp msg)
 void LLPngWrapper::readDataCallback(png_structp png_ptr, png_bytep dest, png_size_t length)
 {
 	PngDataInfo *dataInfo = (PngDataInfo *) png_get_io_ptr(png_ptr);
+	if(dataInfo->mOffset + length > dataInfo->mDataSize)
+	{
+		png_error(png_ptr, "Data read error. Requested data size exceeds available data size.");
+		return;
+	}
+
 	U8 *src = &dataInfo->mData[dataInfo->mOffset];
 	memcpy(dest, src, length);
 	dataInfo->mOffset += static_cast<U32>(length);
@@ -114,7 +120,7 @@ void LLPngWrapper::writeFlush(png_structp png_ptr)
 // The scanline also begins at the bottom of
 // the image (per SecondLife conventions) instead of at the top, so we
 // must assign row-pointers in "reverse" order.
-BOOL LLPngWrapper::readPng(U8* src, LLImageRaw* rawImage, ImageInfo *infop)
+BOOL LLPngWrapper::readPng(U8* src, S32 dataSize, LLImageRaw* rawImage, ImageInfo *infop)
 {
 	try
 	{
@@ -133,6 +139,7 @@ BOOL LLPngWrapper::readPng(U8* src, LLImageRaw* rawImage, ImageInfo *infop)
 		PngDataInfo dataPtr;
 		dataPtr.mData = src;
 		dataPtr.mOffset = 0;
+		dataPtr.mDataSize = dataSize;
 
 		png_set_read_fn(mReadPngPtr, &dataPtr, &readDataCallback);
 		png_set_sig_bytes(mReadPngPtr, 0);
diff --git a/indra/llimage/llpngwrapper.h b/indra/llimage/llpngwrapper.h
index 739f435996..27d7df3bef 100755
--- a/indra/llimage/llpngwrapper.h
+++ b/indra/llimage/llpngwrapper.h
@@ -44,7 +44,7 @@ public:
 	};
 
 	BOOL isValidPng(U8* src);
-	BOOL readPng(U8* src, LLImageRaw* rawImage, ImageInfo *infop = NULL);
+	BOOL readPng(U8* src, S32 dataSize, LLImageRaw* rawImage, ImageInfo *infop = NULL);
 	BOOL writePng(const LLImageRaw* rawImage, U8* dst);
 	U32  getFinalSize();
 	const std::string& getErrorMessage();
@@ -61,6 +61,7 @@ private:
 	{
 		U8 *mData;
 		U32 mOffset;
+		S32 mDataSize;
 	};
 
 	static void writeFlush(png_structp png_ptr);
-- 
cgit v1.2.3


From d61a8e34a3d81e5de02bf997ba6df055217af937 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Tue, 16 Sep 2014 11:01:11 +0300
Subject: MAINT-4434 FIXED Update "Total land in use" and "Land available" when
 saving changes.

---
 indra/newview/llpanelgrouplandmoney.cpp | 37 +++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 13 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelgrouplandmoney.cpp b/indra/newview/llpanelgrouplandmoney.cpp
index 375c54479d..e7002395f8 100755
--- a/indra/newview/llpanelgrouplandmoney.cpp
+++ b/indra/newview/llpanelgrouplandmoney.cpp
@@ -421,20 +421,43 @@ void LLPanelGroupLandMoney::impl::processGroupLand(LLMessageSystem* msg)
 		msg->getUUID("QueryData", "OwnerID", owner_id, 0);
 		msg->getUUID("TransactionData", "TransactionID", trans_id);
 
-		S32 total_contribution = 0;
 		if(owner_id.isNull())
 		{
 			// special block which has total contribution
 			++first_block;
 
+			S32 committed = 0;
+			S32 billable_area = 0;
+			for(S32 i = first_block; i < count; ++i)
+			{
+				msg->getS32("QueryData", "BillableArea", billable_area, i);
+				committed+=billable_area;
+			}
+
+			S32 total_contribution;
 			msg->getS32("QueryData", "ActualArea", total_contribution, 0);
 			mPanel.getChild<LLUICtrl>("total_contributed_land_value")->setTextArg("[AREA]", llformat("%d", total_contribution));
+
+			mPanel.getChild<LLUICtrl>("total_land_in_use_value")->setTextArg("[AREA]", llformat("%d", committed));
+			S32 available = total_contribution - committed;
+			mPanel.getChild<LLUICtrl>("land_available_value")->setTextArg("[AREA]", llformat("%d", available));
+
+
+			if ( mGroupOverLimitTextp && mGroupOverLimitIconp )
+
+			{
+				mGroupOverLimitIconp->setVisible(available < 0);
+				mGroupOverLimitTextp->setVisible(available < 0);
+			}
+
 		}
 
 		if ( trans_id != mTransID ) return;
+
 		// This power was removed to make group roles simpler
 		//if ( !gAgent.hasPowerInGroup(mGroupID, GP_LAND_VIEW_OWNED) ) return;
 		if (!gAgent.isInGroup(mPanel.mGroupID)) return;
+
 		mGroupParcelsp->setCommentText(mEmptyParcelsText);
 
 		std::string name;
@@ -447,7 +470,6 @@ void LLPanelGroupLandMoney::impl::processGroupLand(LLMessageSystem* msg)
 		std::string sim_name;
 		std::string land_sku;
 		std::string land_type;
-		S32 committed = 0;
 
 		for(S32 i = first_block; i < count; ++i)
 		{
@@ -477,7 +499,6 @@ void LLPanelGroupLandMoney::impl::processGroupLand(LLMessageSystem* msg)
 			S32 region_y = llround(global_y) % REGION_WIDTH_UNITS;
 			std::string location = sim_name + llformat(" (%d, %d)", region_x, region_y);
 			std::string area;
-			committed+=billable_area;
 
 
 			if(billable_area == actual_area)
@@ -516,16 +537,6 @@ void LLPanelGroupLandMoney::impl::processGroupLand(LLMessageSystem* msg)
 			
 			mGroupParcelsp->addElement(row);
 		}
-
-		mPanel.getChild<LLUICtrl>("total_land_in_use_value")->setTextArg("[AREA]", llformat("%d", committed));
-
-		S32 available = total_contribution - committed;
-		mPanel.getChild<LLUICtrl>("land_available_value")->setTextArg("[AREA]", llformat("%d", available));
-		if ( mGroupOverLimitTextp && mGroupOverLimitIconp )
-		{
-			mGroupOverLimitIconp->setVisible(available < 0);
-			mGroupOverLimitTextp->setVisible(available < 0);
-		}
 	}
 }
 
-- 
cgit v1.2.3


From eebb94159e061ec90e8dc1387a0de8f7a0733217 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Mon, 15 Sep 2014 20:29:36 +0300
Subject: MAINT-4437 FIXED Spillover Branch shows when it should not

---
 indra/llui/llmenugl.cpp | 67 +++++++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 33 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 3e6002e546..cb0b75ea48 100755
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -60,6 +60,7 @@
 #include "v2math.h"
 #include <set>
 #include <boost/tokenizer.hpp>
+#include <boost/foreach.hpp>
 
 // static
 LLMenuHolderGL *LLMenuGL::sMenuContainer = NULL;
@@ -2038,15 +2039,7 @@ void LLMenuGL::arrange( void )
 
 		// torn off menus are not constrained to the size of the screen
 		U32 max_width = getTornOff() ? U32_MAX : menu_region_rect.getWidth();
-		U32 max_height = U32_MAX;
-		if (!getTornOff())
-		{
-			max_height = getRect().mTop - menu_region_rect.mBottom;
-			if (menu_region_rect.mTop - getRect().mTop > (S32)max_height)
-			{
-				max_height = menu_region_rect.mTop - getRect().mTop;
-			}
-		}
+		U32 max_height = getTornOff() ? U32_MAX: menu_region_rect.getHeight();
 
 		// *FIX: create the item first and then ask for its dimensions?
 		S32 spillover_item_width = PLAIN_PAD_PIXELS + LLFontGL::getFontSansSerif()->getWidth( std::string("More") ); // *TODO: Translate
@@ -2104,13 +2097,15 @@ void LLMenuGL::arrange( void )
 		}
 		else
 		{
+			BOOST_FOREACH(LLMenuItemGL* itemp, mItems)
+			{
+				// do first so LLMenuGLItemCall can call on_visible to determine if visible
+				itemp->buildDrawLabel();
+			}
 			item_list_t::iterator item_iter;
 
 			for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
 			{
-				// do first so LLMenuGLItemCall can call on_visible to determine if visible
-				(*item_iter)->buildDrawLabel();
-		
 				if ((*item_iter)->getVisible())
 				{
 					if (!getTornOff() 
@@ -2118,34 +2113,40 @@ void LLMenuGL::arrange( void )
 						&& *item_iter != mSpilloverBranch
 						&& height + (*item_iter)->getNominalHeight() > max_height - spillover_item_height)
 					{
-						// no room for any more items
-						createSpilloverBranch();
-
-						std::vector<LLMenuItemGL*> items_to_remove;
-						std::copy(item_iter, mItems.end(), std::back_inserter(items_to_remove));
-						std::vector<LLMenuItemGL*>::iterator spillover_iter;
-						for (spillover_iter= items_to_remove.begin(); spillover_iter != items_to_remove.end(); ++spillover_iter)
+						// don't show only one item
+						int visible_items = std::count_if(item_iter, mItems.end(), [](LLMenuItemGL* itemp)
 						{
-							LLMenuItemGL* itemp = (*spillover_iter);
-							removeChild(itemp);
-							mSpilloverMenu->addChild(itemp);
-						}
+							return itemp->getVisible();
+						});
+						if (visible_items>1)
+						{
+							// no room for any more items
+							createSpilloverBranch();
 
+							std::vector<LLMenuItemGL*> items_to_remove;
+							std::copy(item_iter, mItems.end(), std::back_inserter(items_to_remove));
+							std::vector<LLMenuItemGL*>::iterator spillover_iter;
+							for (spillover_iter= items_to_remove.begin(); spillover_iter != items_to_remove.end(); ++spillover_iter)
+							{
+								LLMenuItemGL* itemp = (*spillover_iter);
+								removeChild(itemp);
+								mSpilloverMenu->addChild(itemp);
+							}
 
-						addChild(mSpilloverBranch);
 
-						height += mSpilloverBranch->getNominalHeight();
-						width = llmax( width, mSpilloverBranch->getNominalWidth() );
+							addChild(mSpilloverBranch);
 
-						break;
-					}
-					else
-					{
-						// track our rect
-						height += (*item_iter)->getNominalHeight();
-						width = llmax( width, (*item_iter)->getNominalWidth() );
+							height += mSpilloverBranch->getNominalHeight();
+							width = llmax( width, mSpilloverBranch->getNominalWidth() );
+
+							break;
+						}
 					}
 
+					// track our rect
+					height += (*item_iter)->getNominalHeight();
+					width = llmax( width, (*item_iter)->getNominalWidth() );
+
 					if (mScrollable)
 					{
 						// Determining visible items boundaries
-- 
cgit v1.2.3


From ac23d948a483d9194c7d0daef440521c9f4b4b90 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Tue, 16 Sep 2014 16:49:50 +0300
Subject: MAINT-4437 buildfix for linux - removed lambda expression

---
 indra/llui/llmenugl.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index cb0b75ea48..31df853ab4 100755
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -2114,10 +2114,13 @@ void LLMenuGL::arrange( void )
 						&& height + (*item_iter)->getNominalHeight() > max_height - spillover_item_height)
 					{
 						// don't show only one item
-						int visible_items = std::count_if(item_iter, mItems.end(), [](LLMenuItemGL* itemp)
+						int visible_items = 0;
+						item_list_t::iterator count_iter;
+						for (count_iter = item_iter; count_iter != mItems.end(); ++count_iter)
 						{
-							return itemp->getVisible();
-						});
+							if((*count_iter)->getVisible())
+								visible_items++;
+						}
 						if (visible_items>1)
 						{
 							// no room for any more items
-- 
cgit v1.2.3


From c1fe3a3ed6aca0e0439a4f0d1116a31e9999a495 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 18 Sep 2014 11:46:36 +0300
Subject: MAINT-4433 FIXED Don't start changing scale on first click.

---
 indra/newview/llmanipscale.cpp | 14 +++++++++++++-
 indra/newview/llmanipscale.h   |  3 +++
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llmanipscale.cpp b/indra/newview/llmanipscale.cpp
index 2810941d83..cb505c9d4c 100755
--- a/indra/newview/llmanipscale.cpp
+++ b/indra/newview/llmanipscale.cpp
@@ -352,6 +352,10 @@ BOOL LLManipScale::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
 
 	updateSnapGuides(bbox);
 
+	mFirstClickX = x;
+	mFirstClickY = y;
+	mIsFirstClick = true;
+
 	mDragStartPointGlobal = gAgent.getPosGlobalFromAgent(box_corner_agent);
 	mDragStartCenterGlobal = gAgent.getPosGlobalFromAgent(box_center_agent);
 	LLVector3 far_corner_agent = bbox.localToAgent( unitVectorToLocalBBoxExtent( -1.f * partToUnitVector( mManipPart ), bbox ) );
@@ -415,7 +419,15 @@ BOOL LLManipScale::handleHover(S32 x, S32 y, MASK mask)
 		}
 		else
 		{
-			drag( x, y );
+			if((mFirstClickX != x) || (mFirstClickY != y))
+			{
+				mIsFirstClick = false;
+			}
+
+			if(!mIsFirstClick)
+			{
+				drag( x, y );
+			}
 		}
 		LL_DEBUGS("UserInput") << "hover handled by LLManipScale (active)" << LL_ENDL;		
 	}
diff --git a/indra/newview/llmanipscale.h b/indra/newview/llmanipscale.h
index 7cc3c99810..e93b3d4f83 100755
--- a/indra/newview/llmanipscale.h
+++ b/indra/newview/llmanipscale.h
@@ -172,6 +172,9 @@ private:
 	ESnapRegimes	mSnapRegime; //<! Which, if any, snap regime the cursor is currently residing in.
 	F32				mManipulatorScales[NUM_MANIPULATORS];
 	F32				mBoxHandleSize[NUM_MANIPULATORS];		// The size of the handles at the corners of the bounding box
+	S32				mFirstClickX;
+	S32				mFirstClickY;
+	bool			mIsFirstClick;
 };
 
 #endif  // LL_MANIPSCALE_H
-- 
cgit v1.2.3


From 181e48c4422a69c94956977d1f8da05ce6384f7a Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Wed, 17 Sep 2014 21:13:18 +0300
Subject: =?UTF-8?q?MAINT-4341=20FIXED=20Pixel=20width=20and=20height=20of?=
 =?UTF-8?q?=20the=20preview=20is=20not=20matched=20to=20value=20of=20Width?=
 =?UTF-8?q?=20or=20Height=20text-box=20in=20the=20=E2=80=9CSnapshot=20to?=
 =?UTF-8?q?=20inventory=E2=80=9D=20window?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 indra/newview/llfloatersnapshot.cpp | 18 ++++++++++++++++++
 indra/newview/llpanelsnapshot.cpp   | 35 +++++++++++++++++++++++++++++++++--
 2 files changed, 51 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index 8677028942..04329ff66e 100755
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -383,12 +383,20 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
 			S32 w = gViewerWindow->getWindowWidthRaw();
 			LL_DEBUGS() << "Initializing width spinner (" << width_ctrl->getName() << "): " << w << LL_ENDL;
 			width_ctrl->setValue(w);
+			if(getActiveSnapshotType(floater) == LLSnapshotLivePreview::SNAPSHOT_TEXTURE)
+			{
+				width_ctrl->setIncrement(w >> 1);
+			}
 		}
 		if (height_ctrl->getValue().asInteger() == 0)
 		{
 			S32 h = gViewerWindow->getWindowHeightRaw();
 			LL_DEBUGS() << "Initializing height spinner (" << height_ctrl->getName() << "): " << h << LL_ENDL;
 			height_ctrl->setValue(h);
+			if(getActiveSnapshotType(floater) == LLSnapshotLivePreview::SNAPSHOT_TEXTURE)
+			{
+				height_ctrl->setIncrement(h >> 1);
+			}
 		}
 
 		// Clamp snapshot resolution to window size when showing UI or HUD in snapshot.
@@ -823,6 +831,11 @@ void LLFloaterSnapshot::Impl::updateResolution(LLUICtrl* ctrl, void* data, BOOL
 		{
 			getWidthSpinner(view)->setValue(width);
 			getHeightSpinner(view)->setValue(height);
+			if (getActiveSnapshotType(view) == LLSnapshotLivePreview::SNAPSHOT_TEXTURE)
+			{
+				getWidthSpinner(view)->setIncrement(width >> 1);
+				getHeightSpinner(view)->setIncrement(height >> 1);
+			}
 		}
 
 		if(original_width != width || original_height != height)
@@ -942,6 +955,11 @@ void LLFloaterSnapshot::Impl::setImageSizeSpinnersValues(LLFloaterSnapshot *view
 {
 	getWidthSpinner(view)->forceSetValue(width);
 	getHeightSpinner(view)->forceSetValue(height);
+	if (getActiveSnapshotType(view) == LLSnapshotLivePreview::SNAPSHOT_TEXTURE)
+	{
+		getWidthSpinner(view)->setIncrement(width >> 1);
+		getHeightSpinner(view)->setIncrement(height >> 1);
+	}
 }
 
 // static
diff --git a/indra/newview/llpanelsnapshot.cpp b/indra/newview/llpanelsnapshot.cpp
index 56569e3207..106fb4997e 100755
--- a/indra/newview/llpanelsnapshot.cpp
+++ b/indra/newview/llpanelsnapshot.cpp
@@ -37,6 +37,19 @@
 #include "llsidetraypanelcontainer.h"
 #include "llviewercontrol.h" // gSavedSettings
 
+const S32 MAX_TEXTURE_SIZE = 512 ; //max upload texture size 512 * 512
+
+S32 power_of_two(S32 sz, S32 upper)
+{
+	S32 res = upper;
+	while( upper >= sz)
+	{
+		res = upper;
+		upper >>= 1;
+	}
+	return res;
+}
+
 // virtual
 BOOL LLPanelSnapshot::postBuild()
 {
@@ -164,8 +177,26 @@ void LLPanelSnapshot::cancel()
 void LLPanelSnapshot::onCustomResolutionCommit()
 {
 	LLSD info;
-	info["w"] = getChild<LLUICtrl>(getWidthSpinnerName())->getValue().asInteger();
-	info["h"] = getChild<LLUICtrl>(getHeightSpinnerName())->getValue().asInteger();
+	LLSpinCtrl *widthSpinner = getChild<LLSpinCtrl>(getWidthSpinnerName());
+	LLSpinCtrl *heightSpinner = getChild<LLSpinCtrl>(getHeightSpinnerName());
+	if (getName() == "panel_snapshot_inventory")
+	{
+		S32 width = widthSpinner->getValue().asInteger();
+		width = power_of_two(width, MAX_TEXTURE_SIZE);
+		info["w"] = width;
+		widthSpinner->setIncrement(width >> 1);
+		widthSpinner->forceSetValue(width);
+		S32 height =  heightSpinner->getValue().asInteger();
+		height = power_of_two(height, MAX_TEXTURE_SIZE);
+		heightSpinner->setIncrement(height >> 1);
+		heightSpinner->forceSetValue(height);
+		info["h"] = height;
+	}
+	else
+	{
+		info["w"] = widthSpinner->getValue().asInteger();
+		info["h"] = heightSpinner->getValue().asInteger();
+	}
 	LLFloaterSnapshot::getInstance()->notify(LLSD().with("custom-res-change", info));
 }
 
-- 
cgit v1.2.3


From 82eca97e7b945d76b4cc562d7f4178b00466de5c Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Fri, 19 Sep 2014 13:25:54 +0300
Subject: MAINT-4458 FIXED Enable/disable combobox instead of changing its
 visibility.

---
 indra/newview/llfloaterpreference.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 6e47cbb09f..2eadd40bfa 100755
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -701,13 +701,13 @@ void LLFloaterPreference::onOpen(const LLSD& key)
 				maturity_list->deleteItems(LLSD(SIM_ACCESS_ADULT));
 			}
 		}
-		getChildView("maturity_desired_combobox")->setVisible( true);
+		getChildView("maturity_desired_combobox")->setEnabled( true);
 		getChildView("maturity_desired_textbox")->setVisible( false);
 	}
 	else
 	{
 		getChild<LLUICtrl>("maturity_desired_textbox")->setValue(maturity_combo->getSelectedItemLabel());
-		getChildView("maturity_desired_combobox")->setVisible( false);
+		getChildView("maturity_desired_combobox")->setEnabled( false);
 	}
 
 	// Forget previous language changes.
-- 
cgit v1.2.3


From bfd29121a8e53abb78047764bec5e6b6bdd557f4 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Fri, 19 Sep 2014 19:46:34 +0300
Subject: MAINT-4464 FIXED Viewer displays L$ balance of 'L$20' when L$ service
 is unavailable

---
 indra/newview/skins/default/xui/en/panel_status_bar.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 064ece6e4b..dbf7bc031f 100755
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -51,7 +51,7 @@
      v_pad="4"
      top="0"
      wrap="false" 
-     value="L$20" 
+     value="L$??" 
      width="40" />
     <button
      halign="center"
-- 
cgit v1.2.3


From ceeff4fd2b72b095fa96497f4edfb49eb5c6965b Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Fri, 19 Sep 2014 20:19:48 +0300
Subject: MAINT-3853 FIXED Add llTeleportAgent Notification to the Notification
 List so it can be set to 'never show'

---
 indra/newview/skins/default/xui/en/notifications.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ea1bc66236..6cbacdd80c 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -34,6 +34,12 @@
     </form>
   </template>
 
+  <template name="notifyignore">
+    <form>
+      <ignore text="$ignoretext"/>
+    </form>
+  </template>
+
   <template name="okcancelbuttons">
     <form>
       <button
@@ -9490,6 +9496,9 @@ You have been teleported home by the object '[OBJECT_NAME]'
    type="notify">
    <tag>fail</tag>
 You have been teleported by an attachment on [ITEM_ID]
+   <usetemplate
+    ignoretext="Teleport: You have been teleported by an attachment"
+    name="notifyignore"/>
   </notification>
 
   <notification
-- 
cgit v1.2.3


From ff17358e1f4629c1ef172358354bf7477155303b Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Mon, 22 Sep 2014 11:17:10 +0300
Subject: MAINT-4434 FIXED Mainland land deeding amounts bugged

---
 indra/newview/llpanelgrouplandmoney.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelgrouplandmoney.cpp b/indra/newview/llpanelgrouplandmoney.cpp
index e7002395f8..2f7c44f899 100755
--- a/indra/newview/llpanelgrouplandmoney.cpp
+++ b/indra/newview/llpanelgrouplandmoney.cpp
@@ -428,10 +428,18 @@ void LLPanelGroupLandMoney::impl::processGroupLand(LLMessageSystem* msg)
 
 			S32 committed = 0;
 			S32 billable_area = 0;
-			for(S32 i = first_block; i < count; ++i)
+
+			if(count == 1)
+			{
+				msg->getS32("QueryData", "BillableArea", committed, 0);
+			}
+			else
 			{
-				msg->getS32("QueryData", "BillableArea", billable_area, i);
-				committed+=billable_area;
+				for(S32 i = first_block; i < count; ++i)
+				{
+					msg->getS32("QueryData", "BillableArea", billable_area, i);
+					committed+=billable_area;
+				}
 			}
 
 			S32 total_contribution;
-- 
cgit v1.2.3


From 70ca1d9c9fe7462b4c7c993ec57720b347d46aa3 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Mon, 22 Sep 2014 11:45:05 +0300
Subject: MAINT-4386 FIXED Text in statistics is cut off by the scrollbar in
 the statistics floater

---
 indra/newview/skins/default/xui/de/floater_stats.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/de/floater_stats.xml b/indra/newview/skins/default/xui/de/floater_stats.xml
index f4a9acddec..52077976fc 100755
--- a/indra/newview/skins/default/xui/de/floater_stats.xml
+++ b/indra/newview/skins/default/xui/de/floater_stats.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Statistics" title="STATISTIKEN" width="280">
-	<scroll_container name="statistics_scroll" width="280">
-		<container_view name="statistics_view" width="280">
+<floater name="Statistics" title="STATISTIKEN">
+	<scroll_container name="statistics_scroll">
+		<container_view name="statistics_view">
 			<stat_view label="Basic" name="basic">
 				<stat_bar label="FPS" name="fps"/>
 				<stat_bar label="Empfangene UDP-Daten" name="bandwidth"/>
-- 
cgit v1.2.3


From 9c4a8951fffb2a649647178f396f01cf68f114fc Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Mon, 22 Sep 2014 13:30:11 +0300
Subject: MAINT-4455 FIXED stats - UDP Data should not show any comma

---
 indra/newview/skins/default/xui/en/floater_stats.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index c9a6e1c9c3..a33a7e64a4 100755
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -37,6 +37,7 @@
        <stat_bar name="bandwidth"
                   label="UDP Data Received"
                   stat="activemessagedatareceived"
+                  decimal_digits="0"
                   show_bar="true"/>
         <stat_bar name="packet_loss"
                   label="Packet Loss"
-- 
cgit v1.2.3


From 61e05f912557e3086cd80a10075aeaa6586519be Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Mon, 22 Sep 2014 20:01:55 +0300
Subject: MAINT-4170 Eliminate homoglyphs in URL hostnames: used 3p-uriparser;

---
 indra/cmake/CMakeLists.txt      |  2 ++
 indra/cmake/FindURIPARSER.cmake | 46 +++++++++++++++++++++++++++++++++++++++++
 indra/cmake/URIPARSER.cmake     | 22 ++++++++++++++++++++
 indra/llui/CMakeLists.txt       |  3 +++
 indra/llui/lltextbase.cpp       | 43 +++++++++++++++++++++++++++++++++++++-
 indra/llui/lltextbase.h         |  1 +
 6 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100644 indra/cmake/FindURIPARSER.cmake
 create mode 100644 indra/cmake/URIPARSER.cmake

(limited to 'indra')

diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 10a23ea068..9abdb4b146 100755
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -37,6 +37,7 @@ set(cmake_SOURCE_FILES
     FindNDOF.cmake
     FindOpenJPEG.cmake
     FindSCP.cmake
+    FindURIPARSER.cmake
     FindXmlRpcEpi.cmake
     FindZLIB.cmake
     FMODEX.cmake
@@ -97,6 +98,7 @@ set(cmake_SOURCE_FILES
     Tut.cmake
     UI.cmake
     UnixInstall.cmake
+    URIPARSER.cmake
     Variables.cmake
     ViewerMiscLibs.cmake
     VisualLeakDetector.cmake
diff --git a/indra/cmake/FindURIPARSER.cmake b/indra/cmake/FindURIPARSER.cmake
new file mode 100644
index 0000000000..32457bcd60
--- /dev/null
+++ b/indra/cmake/FindURIPARSER.cmake
@@ -0,0 +1,46 @@
+# -*- cmake -*-
+
+# - Find uriparser
+# Find the URIPARSER includes and library
+# This module defines
+#  URIPARSER_INCLUDE_DIRS, where to find uriparser.h, etc.
+#  URIPARSER_LIBRARIES, the libraries needed to use uriparser.
+#  URIPARSER_FOUND, If false, do not try to use uriparser.
+#
+# This FindURIPARSER is about 43 times as fast the one provided with cmake (2.8.x),
+# because it doesn't look up the version of uriparser, resulting in a dramatic
+# speed up for configure (from 4 minutes 22 seconds to 6 seconds).
+#
+# Note: Since this file is only used for standalone, the windows
+# specific parts were left out.
+
+FIND_PATH(URIPARSER_INCLUDE_DIR uriparser/uri.h
+  NO_SYSTEM_ENVIRONMENT_PATH
+  )
+
+FIND_LIBRARY(URIPARSER_LIBRARY z)
+
+if (URIPARSER_LIBRARY AND URIPARSER_INCLUDE_DIR)
+  SET(URIPARSER_INCLUDE_DIRS ${URIPARSER_INCLUDE_DIR})
+  SET(URIPARSER_LIBRARIES ${URIPARSER_LIBRARY})
+  SET(URIPARSER_FOUND "YES")
+else (URIPARSER_LIBRARY AND URIPARSER_INCLUDE_DIR)
+  SET(URIPARSER_FOUND "NO")
+endif (URIPARSER_LIBRARY AND URIPARSER_INCLUDE_DIR)
+
+if (URIPARSER_FOUND)
+  if (NOT URIPARSER_FIND_QUIETLY)
+    message(STATUS "Found URIPARSER: ${URIPARSER_LIBRARIES}")
+    SET(URIPARSER_FIND_QUIETLY TRUE)
+  endif (NOT URIPARSER_FIND_QUIETLY)
+else (URIPARSER_FOUND)
+  if (URIPARSER_FIND_REQUIRED)
+    message(FATAL_ERROR "Could not find URIPARSER library")
+  endif (URIPARSER_FIND_REQUIRED)
+endif (URIPARSER_FOUND)
+
+mark_as_advanced(
+  URIPARSER_LIBRARY
+  URIPARSER_INCLUDE_DIR
+  )
+
diff --git a/indra/cmake/URIPARSER.cmake b/indra/cmake/URIPARSER.cmake
new file mode 100644
index 0000000000..477e142ce5
--- /dev/null
+++ b/indra/cmake/URIPARSER.cmake
@@ -0,0 +1,22 @@
+# -*- cmake -*-
+
+set(URIPARSER_FIND_QUIETLY ON)
+set(URIPARSER_FIND_REQUIRED ON)
+
+include(Prebuilt)
+
+if (STANDALONE)
+  include(FindURIPARSER)
+else (STANDALONE)
+  use_prebuilt_binary(uriparser)
+  if (WINDOWS)
+    set(URIPARSER_LIBRARIES 
+      debug uriparserd
+      optimized uriparser)
+  else (WINDOWS)
+    set(URIPARSER_LIBRARIES z)
+  endif (WINDOWS)
+  if (WINDOWS OR LINUX)
+    set(URIPARSER_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/uriparser)
+  endif (WINDOWS OR LINUX)
+endif (STANDALONE)
diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index 52738aeb6f..24fdc2268d 100755
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -12,6 +12,7 @@ include(LLRender)
 include(LLWindow)
 include(LLVFS)
 include(LLXML)
+include(URIPARSER)
 
 include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
@@ -28,6 +29,7 @@ include_directories(
 include_directories(SYSTEM
     ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
     ${LLXML_SYSTEM_INCLUDE_DIRS}
+    ${URIPARSER_INCLUDE_DIRS}
     )
 
 set(llui_SOURCE_FILES
@@ -278,6 +280,7 @@ target_link_libraries(llui
     ${LLXML_LIBRARIES}
     ${LLMATH_LIBRARIES}
     ${HUNSPELL_LIBRARY}
+    ${URIPARSER_LIBRARIES}
     ${LLCOMMON_LIBRARIES} # must be after llimage, llwindow, llrender
     )
 
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 9b125a85b9..b9c3417dc8 100755
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -44,6 +44,8 @@
 #include "llwindow.h"
 #include <boost/bind.hpp>
 
+#include "uriparser/Uri.h"
+
 const F32	CURSOR_FLASH_DELAY = 1.0f;  // in seconds
 const S32	CURSOR_THICKNESS = 2;
 const F32	TRIPLE_CLICK_INTERVAL = 0.3f;	// delay between double and triple click.
@@ -2019,6 +2021,41 @@ static LLUIImagePtr image_from_icon_name(const std::string& icon_name)
 
 static LLTrace::BlockTimerStatHandle FTM_PARSE_HTML("Parse HTML");
 
+S32 LLTextBase::normalizeUri(std::string& uri_string)
+{
+	UriParserStateA state;
+	UriUriA uri;
+	state.uri = &uri;
+
+	S32 res = uriParseUriA(&state, uri_string.c_str());
+
+	if (!res)	
+	{
+		res = uriNormalizeSyntaxExA(&uri, URI_NORMALIZE_SCHEME | URI_NORMALIZE_HOST);
+
+		if (!res)
+		{
+			S32 chars_required;
+			res = uriToStringCharsRequiredA(&uri, &chars_required);
+
+			if (!res)
+			{
+				chars_required++;
+				std::vector<char> label_buf(chars_required);
+				res = uriToStringA(&label_buf[0], &uri, chars_required, NULL);
+
+				if (!res)
+				{
+					uri_string = &label_buf[0];
+				}
+			}
+		}
+	}
+
+	uriFreeUriMembersA(&uri);
+	return res;
+}
+
 void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Params& input_params)
 {
 	LLStyle::Params style_params(input_params);
@@ -2055,8 +2092,12 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para
 				std::string subtext=text.substr(0,start);
 				appendAndHighlightText(subtext, part, style_params); 
 			}
+
+			std::string label = match.getLabel();
+			normalizeUri(label);
+
 			// output the styled Url
-			appendAndHighlightTextImpl(match.getLabel(), part, link_params, match.underlineOnHoverOnly());
+			appendAndHighlightTextImpl(label, part, link_params, match.underlineOnHoverOnly());
 			
 			// set the tooltip for the Url label
 			if (! match.getTooltip().empty())
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 738b4d5b8e..dfc10923f3 100755
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -590,6 +590,7 @@ protected:
 	
 	void							appendTextImpl(const std::string &new_text, const LLStyle::Params& input_params = LLStyle::Params());
 	void							appendAndHighlightTextImpl(const std::string &new_text, S32 highlight_part, const LLStyle::Params& style_params, bool underline_on_hover_only = false);
+	S32 normalizeUri(std::string& uri);
 	
 
 protected:
-- 
cgit v1.2.3


From 4a26991e5db99885d25aee1d36fc04d940c35e2f Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Tue, 23 Sep 2014 15:39:45 +0300
Subject: MAINT-2056 FIXED Demote the messages to DEBUG level to prevent spam

---
 indra/llcorehttp/_httppolicy.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/llcorehttp/_httppolicy.cpp b/indra/llcorehttp/_httppolicy.cpp
index fd5a93e192..5cf44f8a82 100755
--- a/indra/llcorehttp/_httppolicy.cpp
+++ b/indra/llcorehttp/_httppolicy.cpp
@@ -403,7 +403,7 @@ bool HttpPolicy::stageAfterCompletion(HttpOpRequest * op)
 	// This op is done, finalize it delivering it to the reply queue...
 	if (! op->mStatus)
 	{
-		LL_WARNS("CoreHttp") << "HTTP request " << static_cast<HttpHandle>(op)
+		LL_DEBUGS("CoreHttp") << "HTTP request " << static_cast<HttpHandle>(op)
 							 << " failed after " << op->mPolicyRetries
 							 << " retries.  Reason:  " << op->mStatus.toString()
 							 << " (" << op->mStatus.toTerseString() << ")"
-- 
cgit v1.2.3


From 90467f699fba557c6ab1bf42c677bead2adc5aef Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Tue, 23 Sep 2014 20:44:59 +0300
Subject: MAINT-3853 Added ignore option for 'teleported by an object on a
 parcel' notification

---
 indra/newview/skins/default/xui/en/notifications.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6cbacdd80c..b4d8046d18 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9507,6 +9507,9 @@ You have been teleported by an attachment on [ITEM_ID]
    type="notify">
    <tag>fail</tag>
 You have been teleported by the object '[OBJECT_NAME]' on the parcel '[PARCEL_NAME]'
+   <usetemplate
+    ignoretext="Teleport: You have been teleported by an object on a parcel"
+    name="notifyignore"/>
   </notification>
 
   <notification
-- 
cgit v1.2.3


From 454a4a2905198b884947e9a3d37dba2e480480da Mon Sep 17 00:00:00 2001
From: Savchenko Maksym <msavchenko@productengine.com>
Date: Wed, 24 Sep 2014 03:36:00 +0300
Subject: MAINT-4482 FIXED [viewer-lion] Mac build fails due to weirdo
 LLTextBase::normalizeUri() issue

---
 indra/cmake/FindURIPARSER.cmake |  2 +-
 indra/cmake/URIPARSER.cmake     | 31 ++++++++++++++++++++++---------
 indra/newview/CMakeLists.txt    |  2 ++
 3 files changed, 25 insertions(+), 10 deletions(-)

(limited to 'indra')

diff --git a/indra/cmake/FindURIPARSER.cmake b/indra/cmake/FindURIPARSER.cmake
index 32457bcd60..8ab9f0f4ed 100644
--- a/indra/cmake/FindURIPARSER.cmake
+++ b/indra/cmake/FindURIPARSER.cmake
@@ -18,7 +18,7 @@ FIND_PATH(URIPARSER_INCLUDE_DIR uriparser/uri.h
   NO_SYSTEM_ENVIRONMENT_PATH
   )
 
-FIND_LIBRARY(URIPARSER_LIBRARY z)
+FIND_LIBRARY(URIPARSER_LIBRARY uriparser)
 
 if (URIPARSER_LIBRARY AND URIPARSER_INCLUDE_DIR)
   SET(URIPARSER_INCLUDE_DIRS ${URIPARSER_INCLUDE_DIR})
diff --git a/indra/cmake/URIPARSER.cmake b/indra/cmake/URIPARSER.cmake
index 477e142ce5..d726c2ffdf 100644
--- a/indra/cmake/URIPARSER.cmake
+++ b/indra/cmake/URIPARSER.cmake
@@ -5,18 +5,31 @@ set(URIPARSER_FIND_REQUIRED ON)
 
 include(Prebuilt)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindURIPARSER)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   use_prebuilt_binary(uriparser)
   if (WINDOWS)
-    set(URIPARSER_LIBRARIES 
+    set(URIPARSER_LIBRARIES.
       debug uriparserd
       optimized uriparser)
-  else (WINDOWS)
-    set(URIPARSER_LIBRARIES z)
+  elseif (LINUX)
+    #
+    # When we have updated static libraries in competition with older
+    # shared libraries and we want the former to win, we need to do some
+    # extra work.  The *_PRELOAD_ARCHIVES settings are invoked early
+    # and will pull in the entire archive to the binary giving it.
+    # priority in symbol resolution.  Beware of cmake moving the
+    # achive load itself to another place on the link command line.  If
+    # that happens, you can try something like -Wl,-luriparser here to hide
+    # the archive.  Also be aware that the linker will not tolerate a
+    # second whole-archive load of the archive.  See viewer's
+    # CMakeLists.txt for more information.
+    #
+    set(URIPARSER_PRELOAD_ARCHIVES -Wl,--whole-archive uriparser -Wl,--no-whole-archive)
+    set(URIPARSER_LIBRARIES uriparser)
+  elseif (DARWIN)
+    set(URIPARSER_LIBRARIES uriparser)
   endif (WINDOWS)
-  if (WINDOWS OR LINUX)
-    set(URIPARSER_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/uriparser)
-  endif (WINDOWS OR LINUX)
-endif (STANDALONE)
+  set(URIPARSER_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/uriparser)
+endif (USESYSTEMLIBS)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index e8f4144e70..154f3b5726 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -49,6 +49,7 @@ include(CMakeCopyIfDifferent)
 include(LLAppearance)
 include(PNG)
 include(ZLIB)
+include(URIPARSER)
 
 if (NOT HAVOK_TPV)
    # When using HAVOK_TPV, the library is precompiled, so no need for this
@@ -1924,6 +1925,7 @@ endif (WINDOWS)
 target_link_libraries(${VIEWER_BINARY_NAME}
     ${PNG_PRELOAD_ARCHIVES}
     ${ZLIB_PRELOAD_ARCHIVES}
+    ${URIPARSER_PRELOAD_ARCHIVES}
     ${UPDATER_LIBRARIES}
     ${GOOGLE_PERFTOOLS_LIBRARIES}
     ${LLAUDIO_LIBRARIES}
-- 
cgit v1.2.3


From f0fa1961a8833fe4d6bb1f5a6c879d238ae7f263 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Wed, 24 Sep 2014 04:20:36 +0300
Subject: MAINT-4482 FIXED [viewer-lion] Mac build fails due to weirdo
 LLTextBase::normalizeUri() issue: windows build fix

---
 indra/cmake/URIPARSER.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/cmake/URIPARSER.cmake b/indra/cmake/URIPARSER.cmake
index d726c2ffdf..de146885a0 100644
--- a/indra/cmake/URIPARSER.cmake
+++ b/indra/cmake/URIPARSER.cmake
@@ -10,7 +10,7 @@ if (USESYSTEMLIBS)
 else (USESYSTEMLIBS)
   use_prebuilt_binary(uriparser)
   if (WINDOWS)
-    set(URIPARSER_LIBRARIES.
+    set(URIPARSER_LIBRARIES
       debug uriparserd
       optimized uriparser)
   elseif (LINUX)
-- 
cgit v1.2.3


From e298325bed05f0f37fd134b72c68cce186475f23 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 23 Sep 2014 19:12:35 -0700
Subject: MAINT-4481 FIX [viewer-lion] Linux build fails due array-bounds issue
 in llmanipscale.cpp This was an out of bounds array access on a code path not
 normally accessed To test, set debug setting ScaleShowAxes to true, go into
 build mode, and hold down Ctrl+Shift to scale an object There should be
 colored bars along the scale axes, limited to the bounds of the object's
 extents

---
 indra/llprimitive/llmodel.cpp  |  4 ++--
 indra/newview/llmanipscale.cpp | 52 +++++++++---------------------------------
 indra/newview/llmanipscale.h   |  1 -
 3 files changed, 13 insertions(+), 44 deletions(-)

(limited to 'indra')

diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index b4963225dc..b19df0200d 100755
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -172,7 +172,7 @@ LLModel::EModelStatus load_face_from_dom_triangles(std::vector<LLVolumeFace>& fa
 
 	if (!pos_source)
 	{
-		llwarns << "Unable to process mesh without position data; invalid model;  invalid model." << llendl;
+		LL_WARNS() << "Unable to process mesh without position data; invalid model;  invalid model." << LL_ENDL;
 		return LLModel::BAD_ELEMENT;
 	}
 	
@@ -193,7 +193,7 @@ LLModel::EModelStatus load_face_from_dom_triangles(std::vector<LLVolumeFace>& fa
 
 	if ((vertex_count == 0) || (tc_count == 0))
 	{
-		llwarns << "Unable to process mesh with empty position array; invalid model." << llendl;
+		LL_WARNS() << "Unable to process mesh with empty position array; invalid model." << LL_ENDL;
 		return LLModel::BAD_ELEMENT;
 	}
 
diff --git a/indra/newview/llmanipscale.cpp b/indra/newview/llmanipscale.cpp
index cb505c9d4c..52222c3727 100755
--- a/indra/newview/llmanipscale.cpp
+++ b/indra/newview/llmanipscale.cpp
@@ -85,7 +85,6 @@ const LLManip::EManipPart MANIPULATOR_IDS[LLManipScale::NUM_MANIPULATORS] =
 	LLManip::LL_FACE_NEGZ
 };
 
-
 F32 get_default_max_prim_scale(bool is_flora)
 {
 	// a bit of a hack, but if it's foilage, we don't want to use the
@@ -292,10 +291,6 @@ void LLManipScale::render()
 				LLGLEnable poly_offset(GL_POLYGON_OFFSET_FILL);
 				glPolygonOffset( -2.f, -2.f);
 
-				// JC - Band-aid until edge stretch working similar to side stretch
-				// in non-uniform.
-				// renderEdges( bbox );
-
 				renderCorners( bbox );
 				renderFaces( bbox );
 
@@ -693,63 +688,38 @@ void LLManipScale::renderFaces( const LLBBox& bbox )
 			{
 			  case 0:
 				conditionalHighlight( LL_FACE_POSZ, &z_highlight_color, &z_normal_color );
-				renderAxisHandle( LL_FACE_POSZ, ctr, LLVector3( ctr.mV[VX], ctr.mV[VY], max.mV[VZ] ) );
+				renderAxisHandle( 8, ctr, LLVector3( ctr.mV[VX], ctr.mV[VY], max.mV[VZ] ) );
 				break;
 
 			  case 1:
 				conditionalHighlight( LL_FACE_POSX, &x_highlight_color, &x_normal_color );
-				renderAxisHandle( LL_FACE_POSX, ctr, LLVector3( max.mV[VX], ctr.mV[VY], ctr.mV[VZ] ) );
+				renderAxisHandle( 9, ctr, LLVector3( max.mV[VX], ctr.mV[VY], ctr.mV[VZ] ) );
 				break;
 
 			  case 2:
 				conditionalHighlight( LL_FACE_POSY, &y_highlight_color, &y_normal_color );
-				renderAxisHandle( LL_FACE_POSY, ctr, LLVector3( ctr.mV[VX], max.mV[VY], ctr.mV[VZ] ) );
+				renderAxisHandle( 10, ctr, LLVector3( ctr.mV[VX], max.mV[VY], ctr.mV[VZ] ) );
 				break;
 
 			  case 3:
 				conditionalHighlight( LL_FACE_NEGX, &x_highlight_color, &x_normal_color );
-				renderAxisHandle( LL_FACE_NEGX, ctr, LLVector3( min.mV[VX], ctr.mV[VY], ctr.mV[VZ] ) );
+				renderAxisHandle( 11, ctr, LLVector3( min.mV[VX], ctr.mV[VY], ctr.mV[VZ] ) );
 				break;
 
 			  case 4:
 				conditionalHighlight( LL_FACE_NEGY, &y_highlight_color, &y_normal_color );
-				renderAxisHandle( LL_FACE_NEGY, ctr, LLVector3( ctr.mV[VX], min.mV[VY], ctr.mV[VZ] ) );
+				renderAxisHandle( 12, ctr, LLVector3( ctr.mV[VX], min.mV[VY], ctr.mV[VZ] ) );
 				break;
 
 			  case 5:
 				conditionalHighlight( LL_FACE_NEGZ, &z_highlight_color, &z_normal_color );
-				renderAxisHandle( LL_FACE_NEGZ, ctr, LLVector3( ctr.mV[VX], ctr.mV[VY], min.mV[VZ] ) );
+				renderAxisHandle( 13, ctr, LLVector3( ctr.mV[VX], ctr.mV[VY], min.mV[VZ] ) );
 				break;
 			}
 		}
 	}
 }
 
-void LLManipScale::renderEdges( const LLBBox& bbox )
-{
-	LLVector3 extent = bbox.getExtentLocal();
-
-	for( U32 part = LL_EDGE_MIN; part <= LL_EDGE_MAX; part++ )
-	{
-		F32 edge_width = mBoxHandleSize[part] * .6f;
-		LLVector3 direction = edgeToUnitVector( part );
-		LLVector3 center_to_edge = unitVectorToLocalBBoxExtent( direction, bbox );
-
-		gGL.pushMatrix();
-		{
-			gGL.translatef( center_to_edge.mV[0], center_to_edge.mV[1], center_to_edge.mV[2] );
-			conditionalHighlight( part );
-			gGL.scalef(
-				direction.mV[0] ? edge_width : extent.mV[VX],
-				direction.mV[1] ? edge_width : extent.mV[VY],
-				direction.mV[2] ? edge_width : extent.mV[VZ] );
-			gBox.render();
-		}
-		gGL.popMatrix();
-	}
-}
-
-
 void LLManipScale::renderCorners( const LLBBox& bbox )
 {
 	U32 part = LL_CORNER_NNN;
@@ -792,14 +762,14 @@ void LLManipScale::renderBoxHandle( F32 x, F32 y, F32 z )
 }
 
 
-void LLManipScale::renderAxisHandle( U32 part, const LLVector3& start, const LLVector3& end )
+void LLManipScale::renderAxisHandle( U32 handle_index, const LLVector3& start, const LLVector3& end )
 {
 	if( getShowAxes() )
 	{
 		// Draws a single "jacks" style handle: a long, retangular box from start to end.
 		LLVector3 offset_start = end - start;
 		offset_start.normalize();
-		offset_start = start + mBoxHandleSize[part] * offset_start;
+		offset_start = start + mBoxHandleSize[handle_index] * offset_start;
 
 		LLVector3 delta = end - offset_start;
 		LLVector3 pos = offset_start + 0.5f * delta;
@@ -808,9 +778,9 @@ void LLManipScale::renderAxisHandle( U32 part, const LLVector3& start, const LLV
 		{
 			gGL.translatef( pos.mV[VX], pos.mV[VY], pos.mV[VZ] );
 			gGL.scalef(
-				mBoxHandleSize[part] + llabs(delta.mV[VX]),
-				mBoxHandleSize[part] + llabs(delta.mV[VY]),
-				mBoxHandleSize[part] + llabs(delta.mV[VZ]));
+				mBoxHandleSize[handle_index] + llabs(delta.mV[VX]),
+				mBoxHandleSize[handle_index] + llabs(delta.mV[VY]),
+				mBoxHandleSize[handle_index] + llabs(delta.mV[VZ]));
 			gBox.render();
 		}
 		gGL.popMatrix();
diff --git a/indra/newview/llmanipscale.h b/indra/newview/llmanipscale.h
index e93b3d4f83..11ade9b7d0 100755
--- a/indra/newview/llmanipscale.h
+++ b/indra/newview/llmanipscale.h
@@ -96,7 +96,6 @@ public:
 private:
 	void			renderCorners( const LLBBox& local_bbox );
 	void			renderFaces( const LLBBox& local_bbox );
-	void			renderEdges( const LLBBox& local_bbox );
 	void			renderBoxHandle( F32 x, F32 y, F32 z );
 	void			renderAxisHandle( U32 part, const LLVector3& start, const LLVector3& end );
 	void			renderGuidelinesPart( const LLBBox& local_bbox );
-- 
cgit v1.2.3


From 2f08102780b1508563684b65a64e565caab7b143 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Wed, 24 Sep 2014 12:03:35 +0300
Subject: MAINT-1885 FIXED Don't allow to sit while in Editing appearance mode.

---
 indra/newview/llviewermenu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 38aaff9279..3cc4858226 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -3590,7 +3590,7 @@ class LLSelfSitDown : public view_listener_t
 
 bool enable_sitdown_self()
 {
-    return isAgentAvatarValid() && !gAgentAvatarp->isSitting() && !gAgent.getFlying();
+    return isAgentAvatarValid() && !gAgentAvatarp->isSitting() && !gAgentAvatarp->isEditingAppearance() && !gAgent.getFlying();
 }
 
 class LLCheckPanelPeopleTab : public view_listener_t
-- 
cgit v1.2.3


From dd8d2b59f74ff01bd0b79b841e3974b3b00ddeb1 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Wed, 24 Sep 2014 23:09:30 +0300
Subject: MAINT-4170 FIXED Eliminate homoglyphs in URL hostnames: converting to
 lowercase links without scheme

---
 indra/llui/lltextbase.cpp | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index b9c3417dc8..8395e74715 100755
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -2031,25 +2031,45 @@ S32 LLTextBase::normalizeUri(std::string& uri_string)
 
 	if (!res)	
 	{
-		res = uriNormalizeSyntaxExA(&uri, URI_NORMALIZE_SCHEME | URI_NORMALIZE_HOST);
-
-		if (!res)
+		if (uri.scheme.afterLast - uri.scheme.first > 0)
 		{
-			S32 chars_required;
-			res = uriToStringCharsRequiredA(&uri, &chars_required);
+			res = uriNormalizeSyntaxExA(&uri, URI_NORMALIZE_SCHEME | URI_NORMALIZE_HOST);
 
 			if (!res)
 			{
-				chars_required++;
-				std::vector<char> label_buf(chars_required);
-				res = uriToStringA(&label_buf[0], &uri, chars_required, NULL);
+				S32 chars_required;
+				res = uriToStringCharsRequiredA(&uri, &chars_required);
 
 				if (!res)
 				{
-					uri_string = &label_buf[0];
+					chars_required++;
+					std::vector<char> label_buf(chars_required);
+					res = uriToStringA(&label_buf[0], &uri, chars_required, NULL);
+
+					if (!res)
+					{
+						uri_string = &label_buf[0];
+					}
 				}
 			}
 		}
+		else if (uri_string.find_first_of('.') != std::string::npos)
+		{
+			static bool recursive_call = false;
+
+			// allow only single level recursive call
+			if (!recursive_call)
+			{
+				recursive_call = true;
+
+				// force uri to be with scheme and try to normalize
+				std::string uri_with_scheme = "http://";
+				uri_with_scheme += uri_string;
+				normalizeUri(uri_with_scheme);
+				uri_string = uri_with_scheme.substr(7);
+				recursive_call = false;
+			}		
+		}
 	}
 
 	uriFreeUriMembersA(&uri);
-- 
cgit v1.2.3


From 5033f6b14b9a2156b36cbce52365f6b420c72fd2 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Wed, 24 Sep 2014 20:17:44 +0300
Subject: MAINT-4398 FIXED Moving view away from selected prims causes some to
 deselect themselves since viewer-interesting

---
 indra/newview/llviewerregion.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 11cbf3fc24..7a6637c0a1 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1485,6 +1485,12 @@ void LLViewerRegion::killObject(LLVOCacheEntry* entry, std::vector<LLDrawable*>&
 
 	if(drawablep && !drawablep->getParent())
 	{
+		if (drawablep->getVObj()->isSelected())
+		{
+			// do not remove selected objects
+			((LLViewerOctreeEntryData*)drawablep)->setVisible();
+			return;
+		}
 		LLViewerObject::const_child_list_t& child_list = drawablep->getVObj()->getChildren();
 		for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
 			iter != child_list.end(); iter++)
@@ -1492,9 +1498,9 @@ void LLViewerRegion::killObject(LLVOCacheEntry* entry, std::vector<LLDrawable*>&
 			LLViewerObject* child = *iter;
 			if(child->mDrawable)
 			{
-				if(!child->mDrawable->getEntry() || !child->mDrawable->getEntry()->hasVOCacheEntry())
+				if(!child->mDrawable->getEntry() || !child->mDrawable->getEntry()->hasVOCacheEntry() || child->isSelected())
 				{
-					//do not remove parent if any of its children non-cacheable
+					//do not remove parent if any of its children non-cacheable or selected
 					//especially for the case that an avatar sits on a cache-able object
 					((LLViewerOctreeEntryData*)drawablep)->setVisible();
 					return;
-- 
cgit v1.2.3


From 41170b5603f9d6e6d6a9ec598ab60b9b74315b32 Mon Sep 17 00:00:00 2001
From: ruslantproductengine <ruslantproductengine@lindenlab.com>
Date: Thu, 25 Sep 2014 21:19:17 +0300
Subject: MAINT-4329 FIXED scales each image *twice* for no apparent reason :
 patchset #2

---
 indra/llimage/llimage.cpp | 66 +++++++++++------------------------------------
 indra/llimage/llimage.h   | 10 +++----
 indra/llmath/llmath.h     | 30 +++++++++++++++++++++
 3 files changed, 50 insertions(+), 56 deletions(-)

(limited to 'indra')

diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index d336eeaabc..eaac6806ab 100755
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -524,7 +524,7 @@ inline U8 LLImageRaw::fastFractionalMult( U8 a, U8 b )
 }
 
 
-void LLImageRaw::composite( LLImageRaw* src )
+void LLImageRaw::composite( const LLImageRaw* src )
 {
 	LLImageRaw* dst = this;  // Just for clarity.
 
@@ -560,7 +560,7 @@ void LLImageRaw::composite( LLImageRaw* src )
 }
 
 // Src and dst can be any size.  Src has 4 components.  Dst has 3 components.
-void LLImageRaw::compositeScaled4onto3(LLImageRaw* src)
+void LLImageRaw::compositeScaled4onto3(const LLImageRaw* src)
 {
 	LL_INFOS() << "compositeScaled4onto3" << LL_ENDL;
 
@@ -568,26 +568,12 @@ void LLImageRaw::compositeScaled4onto3(LLImageRaw* src)
 
 	llassert( (4 == src->getComponents()) && (3 == dst->getComponents()) );
 
-	S32 temp_data_size = src->getWidth() * dst->getHeight() * src->getComponents();
-	llassert_always(temp_data_size > 0);
-	std::vector<U8> temp_buffer(temp_data_size);
-
-	// Vertical: scale but no composite
-	for( S32 col = 0; col < src->getWidth(); col++ )
-	{
-		copyLineScaled( src->getData() + (src->getComponents() * col), &temp_buffer[0] + (src->getComponents() * col), src->getHeight(), dst->getHeight(), src->getWidth(), src->getWidth() );
-	}
-
-	// Horizontal: scale and composite
-	for( S32 row = 0; row < dst->getHeight(); row++ )
-	{
-		compositeRowScaled4onto3( &temp_buffer[0] + (src->getComponents() * src->getWidth() * row), dst->getData() + (dst->getComponents() * dst->getWidth() * row), src->getWidth(), dst->getWidth() );
-	}
+	ll_nn2d_interpolation(src->getData(), src->getWidth(), src->getHeight(), src->getComponents(), dst->getData(), dst->getWidth(), dst->getHeight(), dst->getComponents());
 }
 
 
 // Src and dst are same size.  Src has 4 components.  Dst has 3 components.
-void LLImageRaw::compositeUnscaled4onto3( LLImageRaw* src )
+void LLImageRaw::compositeUnscaled4onto3( const LLImageRaw* src )
 {
 	/*
 	//test fastFractionalMult()
@@ -610,7 +596,7 @@ void LLImageRaw::compositeUnscaled4onto3( LLImageRaw* src )
 	llassert( (src->getWidth() == dst->getWidth()) && (src->getHeight() == dst->getHeight()) );
 
 
-	U8* src_data = src->getData();
+	const U8* src_data = src->getData();
 	U8* dst_data = dst->getData();
 	S32 pixels = getWidth() * getHeight();
 	while( pixels-- )
@@ -751,7 +737,7 @@ void LLImageRaw::copy(LLImageRaw* src)
 }
 
 // Src and dst are same size.  Src and dst have same number of components.
-void LLImageRaw::copyUnscaled(LLImageRaw* src)
+void LLImageRaw::copyUnscaled(const LLImageRaw* src)
 {
 	LLImageRaw* dst = this;  // Just for clarity.
 
@@ -833,7 +819,7 @@ void LLImageRaw::copyUnscaled3onto4( LLImageRaw* src )
 
 
 // Src and dst can be any size.  Src and dst have same number of components.
-void LLImageRaw::copyScaled( LLImageRaw* src )
+void LLImageRaw::copyScaled( const LLImageRaw* src )
 {
 	LLImageRaw* dst = this;  // Just for clarity.
 
@@ -846,21 +832,7 @@ void LLImageRaw::copyScaled( LLImageRaw* src )
 		return;
 	}
 
-	S32 temp_data_size = src->getWidth() * dst->getHeight() * getComponents();
-	llassert_always(temp_data_size > 0);
-	std::vector<U8> temp_buffer(temp_data_size);
-
-	// Vertical
-	for( S32 col = 0; col < src->getWidth(); col++ )
-	{
-		copyLineScaled( src->getData() + (getComponents() * col), &temp_buffer[0] + (getComponents() * col), src->getHeight(), dst->getHeight(), src->getWidth(), src->getWidth() );
-	}
-
-	// Horizontal
-	for( S32 row = 0; row < dst->getHeight(); row++ )
-	{
-		copyLineScaled( &temp_buffer[0] + (getComponents() * src->getWidth() * row), dst->getData() + (getComponents() * dst->getWidth() * row), src->getWidth(), dst->getWidth(), 1, 1 );
-	}
+	ll_nn2d_interpolation(src->getData(), src->getWidth(), src->getHeight(), src->getComponents(), dst->getData(), dst->getWidth(), dst->getHeight(), dst->getComponents());
 }
 
 
@@ -880,25 +852,17 @@ BOOL LLImageRaw::scale( S32 new_width, S32 new_height, BOOL scale_image_data )
 
 	if (scale_image_data)
 	{
-		S32 temp_data_size = old_width * new_height * getComponents();
-		llassert_always(temp_data_size > 0);
-		std::vector<U8> temp_buffer(temp_data_size);
+		S32 new_data_size = new_width * new_height * getComponents();
+		llassert_always(new_data_size > 0);
 
-		// Vertical
-		for( S32 col = 0; col < old_width; col++ )
+		U8 *new_data = (U8*)ALLOCATE_MEM(LLImageBase::getPrivatePool(), new_data_size); 
+		if(NULL == new_data) 
 		{
-			copyLineScaled( getData() + (getComponents() * col), &temp_buffer[0] + (getComponents() * col), old_height, new_height, old_width, old_width );
+			return FALSE; 
 		}
 
-		deleteData();
-
-		U8* new_buffer = allocateDataSize(new_width, new_height, getComponents());
-
-		// Horizontal
-		for( S32 row = 0; row < new_height; row++ )
-		{
-			copyLineScaled( &temp_buffer[0] + (getComponents() * old_width * row), new_buffer + (getComponents() * new_width * row), old_width, new_width, 1, 1 );
-		}
+		ll_nn2d_interpolation(getData(), old_width, old_height, getComponents(), new_data, new_width, new_height, getComponents());
+		setDataAndSize(new_data, new_width, new_height, getComponents());
 	}
 	else
 	{
diff --git a/indra/llimage/llimage.h b/indra/llimage/llimage.h
index cd3f76f1fd..eeb8e6de53 100755
--- a/indra/llimage/llimage.h
+++ b/indra/llimage/llimage.h
@@ -229,7 +229,7 @@ public:
 	void copy( LLImageRaw* src );
 
 	// Src and dst are same size.  Src and dst have same number of components.
-	void copyUnscaled( LLImageRaw* src );
+	void copyUnscaled( const LLImageRaw* src );
 	
 	// Src and dst are same size.  Src has 4 components.  Dst has 3 components.
 	void copyUnscaled4onto3( LLImageRaw* src );
@@ -243,7 +243,7 @@ public:
 	void copyUnscaledAlphaMask( LLImageRaw* src, const LLColor4U& fill);
 
 	// Src and dst can be any size.  Src and dst have same number of components.
-	void copyScaled( LLImageRaw* src );
+	void copyScaled( const LLImageRaw* src );
 
 	// Src and dst can be any size.  Src has 3 components.  Dst has 4 components.
 	void copyScaled3onto4( LLImageRaw* src );
@@ -255,13 +255,13 @@ public:
 	// Composite operations
 
 	// Src and dst can be any size.  Src and dst can each have 3 or 4 components.
-	void composite( LLImageRaw* src );
+	void composite( const LLImageRaw* src );
 
 	// Src and dst can be any size.  Src has 4 components.  Dst has 3 components.
-	void compositeScaled4onto3( LLImageRaw* src );
+	void compositeScaled4onto3( const LLImageRaw* src );
 
 	// Src and dst are same size.  Src has 4 components.  Dst has 3 components.
-	void compositeUnscaled4onto3( LLImageRaw* src );
+	void compositeUnscaled4onto3( const LLImageRaw* src );
 
 protected:
 	// Create an image from a local file (generally used in tools)
diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h
index a8b27ad189..b4ac1dec73 100755
--- a/indra/llmath/llmath.h
+++ b/indra/llmath/llmath.h
@@ -32,6 +32,7 @@
 #include <vector>
 #include <limits>
 #include "lldefs.h"
+#include "llerror.h"
 //#include "llstl.h" // *TODO: Remove when LLString is gone
 //#include "llstring.h" // *TODO: Remove when LLString is gone
 // lltut.h uses is_approx_equal_fraction(). This was moved to its own header
@@ -556,6 +557,35 @@ inline void ll_remove_outliers(std::vector<VEC_TYPE>& data, F32 k)
 	}
 }
 
+inline void	ll_nn2d_interpolation(const U8 *const src, U32 srcW, U32 srcH, U8 srcCh, U8 *const dst, U32 dstW, U32 dstH, U8 dstCh)
+{
+	llassert(srcCh>=dstCh);
+
+	S32 tmp_x = 0, tmp_y = 0, tmp_x1 = 0, tmp_x2 = 0;
+
+	const S32 x_r = ((srcW<<16)/dstW)+1;
+	const S32 y_r = ((srcH<<16)/dstH)+1;
+	const S32 srcW_ch = srcW*srcCh;
+	const S32 dstW_ch = dstW*dstCh;
+
+	for(U32 y = 0; y < dstH; ++y)
+	{
+		tmp_y = ((y*y_r)>>16)*srcW_ch;
+		tmp_x1 = y*dstW_ch;
+
+		for(U32 x = 0; x < dstW; x++)
+		{
+			tmp_x = (((x*x_r)>>16)*srcCh)+tmp_y;
+			tmp_x2 = tmp_x1+x*dstCh;
+
+			for(U8 c = 0; c < dstCh; ++c)
+			{
+				dst[tmp_x2+c] = src[tmp_x+c];
+			}
+		}
+	}
+}
+
 // Include simd math header
 #include "llsimdmath.h"
 
-- 
cgit v1.2.3


From d4dee3fafc38c9af43be485adf5acd8ea9227b4c Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Fri, 26 Sep 2014 15:48:10 +0300
Subject: MAINT-4291 FIXED Spelling mistake in llGodLikeRezObject

---
 indra/newview/app_settings/keywords_lsl_default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/keywords_lsl_default.xml b/indra/newview/app_settings/keywords_lsl_default.xml
index 37dd2db93f..cea7a58949 100755
--- a/indra/newview/app_settings/keywords_lsl_default.xml
+++ b/indra/newview/app_settings/keywords_lsl_default.xml
@@ -10980,7 +10980,7 @@
                </map>
             </array>
             <key>tooltip</key>
-            <string>Rez directly off of a UUID if owner has dog-bit set.</string>
+            <string>Rez directly off of a UUID if owner has god-bit set.</string>
          </map>
          <key>llGround</key>
          <map>
-- 
cgit v1.2.3


From e0efa75ab799b41612c3c87874dff8ea38737a92 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Fri, 26 Sep 2014 18:03:50 +0300
Subject: MAINT-3788 FIXED [Profile Notes] CTRL+cursor (e.g. CTRL+LEFT ARROW)
 doesn't work in the profile notes editor. Left, Right, Home, End now work in
 profile notes.

---
 indra/newview/llviewermedia.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 8499012cfc..721ee1f0f5 100755
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -2703,7 +2703,7 @@ bool LLViewerMediaImpl::handleKeyHere(KEY key, MASK mask)
 	{
 		// FIXME: THIS IS SO WRONG.
 		// Menu keys should be handled by the menu system and not passed to UI elements, but this is how LLTextEditor and LLLineEditor do it...
-		if( MASK_CONTROL & mask )
+		if( MASK_CONTROL & mask && key != KEY_LEFT && key != KEY_RIGHT && key != KEY_HOME && key != KEY_END)
 		{
 			result = true;
 		}
-- 
cgit v1.2.3


From 1edf45f33b52b2f7e86d0e9b58fa7373e4870f5a Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Mon, 29 Sep 2014 11:37:54 +0300
Subject: MAINT-4473 FIXED Don't erase logs location path on pressing Cancel
 button.

---
 indra/newview/llfloaterpreference.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 2eadd40bfa..08d82bfd95 100755
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1998,6 +1998,12 @@ void LLPanelPreference::cancel()
 	{
 		LLControlVariable* control = iter->first;
 		LLSD ctrl_value = iter->second;
+
+		if((control->getName() == "InstantMessageLogPath") && (ctrl_value.asString() == ""))
+		{
+			continue;
+		}
+
 		control->set(ctrl_value);
 	}
 
-- 
cgit v1.2.3


From caaa711c6a4e56795b1fd08f0585cedba3e4212c Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Tue, 30 Sep 2014 20:02:33 +0300
Subject: MAINT-4448 FIXED Avatar often stops animating when being animated by
 an intan solo dance ball on Interesting based viewers only.

---
 indra/newview/llviewerregion.cpp | 16 +++++++++++-----
 indra/newview/llviewerregion.h   |  2 +-
 indra/newview/llvoavatar.cpp     |  9 +++++++++
 indra/newview/llvoavatar.h       |  1 +
 indra/newview/llvoavatarself.cpp |  8 ++++++++
 indra/newview/llvoavatarself.h   |  1 +
 6 files changed, 31 insertions(+), 6 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 7a6637c0a1..7d82ecf565 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -66,6 +66,7 @@
 #include "llviewerstatsrecorder.h"
 #include "llvlmanager.h"
 #include "llvlcomposition.h"
+#include "llvoavatarself.h"
 #include "llvocache.h"
 #include "llworld.h"
 #include "llspatialpartition.h"
@@ -1485,22 +1486,27 @@ void LLViewerRegion::killObject(LLVOCacheEntry* entry, std::vector<LLDrawable*>&
 
 	if(drawablep && !drawablep->getParent())
 	{
-		if (drawablep->getVObj()->isSelected())
+		LLViewerObject* v_obj = drawablep->getVObj();
+		if (v_obj->isSelected()
+			|| (v_obj->flagAnimSource() && isAgentAvatarValid() && gAgentAvatarp->hasMotionFromSource(v_obj->getID())))
 		{
-			// do not remove selected objects
+			// do not remove objects user is interacting with
 			((LLViewerOctreeEntryData*)drawablep)->setVisible();
 			return;
 		}
-		LLViewerObject::const_child_list_t& child_list = drawablep->getVObj()->getChildren();
+		LLViewerObject::const_child_list_t& child_list = v_obj->getChildren();
 		for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
 			iter != child_list.end(); iter++)
 		{
 			LLViewerObject* child = *iter;
 			if(child->mDrawable)
 			{
-				if(!child->mDrawable->getEntry() || !child->mDrawable->getEntry()->hasVOCacheEntry() || child->isSelected())
+				if( !child->mDrawable->getEntry()
+					|| !child->mDrawable->getEntry()->hasVOCacheEntry()
+					|| child->isSelected()
+					|| (child->flagAnimSource() && isAgentAvatarValid() && gAgentAvatarp->hasMotionFromSource(child->getID())))
 				{
-					//do not remove parent if any of its children non-cacheable or selected
+					//do not remove parent if any of its children non-cacheable, animating or selected
 					//especially for the case that an avatar sits on a cache-able object
 					((LLViewerOctreeEntryData*)drawablep)->setVisible();
 					return;
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index 1e225553b8..d01e746936 100755
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -385,7 +385,7 @@ public:
 private:
 	void addToVOCacheTree(LLVOCacheEntry* entry);
 	LLViewerObject* addNewObject(LLVOCacheEntry* entry);
-	void killObject(LLVOCacheEntry* entry, std::vector<LLDrawable*>& delete_list);	
+	void killObject(LLVOCacheEntry* entry, std::vector<LLDrawable*>& delete_list); //adds entry into list if it is safe to move into cache
 	void removeFromVOCacheTree(LLVOCacheEntry* entry);
 	void killCacheEntry(LLVOCacheEntry* entry, bool for_rendering = false); //physically delete the cache entry	
 	void killInvisibleObjects(F32 max_time);
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 904d08ac73..dfb9bb54e7 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -5016,6 +5016,15 @@ BOOL LLVOAvatar::stopMotion(const LLUUID& id, BOOL stop_immediate)
 	return LLCharacter::stopMotion(remap_id, stop_immediate);
 }
 
+//-----------------------------------------------------------------------------
+// hasMotionFromSource()
+//-----------------------------------------------------------------------------
+// virtual
+bool LLVOAvatar::hasMotionFromSource(const LLUUID& source_id)
+{
+	return false;
+}
+
 //-----------------------------------------------------------------------------
 // stopMotionFromSource()
 //-----------------------------------------------------------------------------
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 66a357ff62..4d5e616906 100755
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -191,6 +191,7 @@ public:
 	/*virtual*/ LLUUID			remapMotionID(const LLUUID& id);
 	/*virtual*/ BOOL			startMotion(const LLUUID& id, F32 time_offset = 0.f);
 	/*virtual*/ BOOL			stopMotion(const LLUUID& id, BOOL stop_immediate = FALSE);
+	virtual bool			hasMotionFromSource(const LLUUID& source_id);
 	virtual void			stopMotionFromSource(const LLUUID& source_id);
 	virtual void			requestStopMotion(LLMotion* motion);
 	LLMotion*				findMotion(const LLUUID& id) const;
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 42a7c2e576..02494d5091 100755
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -748,6 +748,13 @@ void LLVOAvatarSelf::requestStopMotion(LLMotion* motion)
 	gAgent.requestStopMotion(motion);
 }
 
+// virtual
+bool LLVOAvatarSelf::hasMotionFromSource(const LLUUID& source_id)
+{
+	AnimSourceIterator motion_it = mAnimationSources.find(source_id);
+	return motion_it != mAnimationSources.end();
+}
+
 // virtual
 void LLVOAvatarSelf::stopMotionFromSource(const LLUUID& source_id)
 {
@@ -757,6 +764,7 @@ void LLVOAvatarSelf::stopMotionFromSource(const LLUUID& source_id)
 		mAnimationSources.erase(motion_it++);
 	}
 
+
 	LLViewerObject* object = gObjectList.findObject(source_id);
 	if (object)
 	{
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h
index e03de9fa0b..ad73dd89b7 100755
--- a/indra/newview/llvoavatarself.h
+++ b/indra/newview/llvoavatarself.h
@@ -82,6 +82,7 @@ public:
 	// LLCharacter interface and related
 	//--------------------------------------------------------------------
 public:
+	/*virtual*/ bool 		hasMotionFromSource(const LLUUID& source_id);
 	/*virtual*/ void 		stopMotionFromSource(const LLUUID& source_id);
 	/*virtual*/ void 		requestStopMotion(LLMotion* motion);
 	/*virtual*/ LLJoint*	getJoint(const std::string &name);
-- 
cgit v1.2.3


From 238eadde6d8a7df1a8cdab4ed6cb24017479d529 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 2 Oct 2014 12:20:53 +0300
Subject: MAINT-4497 FIXED Use uriparser to find actual domain name.

---
 indra/newview/llweb.cpp | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp
index 0312972a22..0f0d9ce703 100755
--- a/indra/newview/llweb.cpp
+++ b/indra/newview/llweb.cpp
@@ -50,6 +50,8 @@
 #include "llviewerwindow.h"
 #include "llnotificationsutil.h"
 
+#include "uriparser/Uri.h"
+
 #include <boost/regex.hpp>
 
 bool on_load_url_external_response(const LLSD& notification, const LLSD& response, bool async );
@@ -238,9 +240,23 @@ bool LLWeb::useExternalBrowser(const std::string &url)
 	}
 	else if (gSavedSettings.getU32("PreferredBrowserBehavior") == BROWSER_INT_LL_EXT_OTHERS)
 	{
-		boost::regex pattern = boost::regex("\\b(lindenlab.com|secondlife.com)\\b", boost::regex::perl|boost::regex::icase);
+		UriParserStateA state;
+		UriUriA uri;
+		state.uri = &uri;
+
+		std::string uri_string = url;
+		uriParseUriA(&state, uri_string.c_str());
+		if (uri.hostText.first)
+		{
+			S32 length = uri.hostText.afterLast - uri.hostText.first;
+			std::string buf = uri.hostText.first;
+			uri_string = buf.substr(0,length);
+		}
+		uriFreeUriMembersA(&uri);
+
+		boost::regex pattern = boost::regex("\\b(lindenlab.com|secondlife.com)$", boost::regex::perl|boost::regex::icase);
 		boost::match_results<std::string::const_iterator> matches;
-		return !(boost::regex_search(url, matches, pattern));	
+		return !(boost::regex_search(uri_string, matches, pattern));
 	}
 	return false;
 }
-- 
cgit v1.2.3


From d4dcae0ac9af5adee85c56b6d55024132272b15c Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Thu, 2 Oct 2014 16:37:59 +0300
Subject: MAINT-4501 FIXED Viewer spams error message if it can't find an audio
 device

---
 indra/newview/llviewerobject.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 33b442815d..78e9216f61 100755
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -5182,7 +5182,6 @@ void LLViewerObject::setAttachedSound(const LLUUID &audio_uuid, const LLUUID& ow
 {
 	if (!gAudiop)
 	{
-		LL_WARNS("AudioEngine") << "LLAudioEngine instance doesn't exist!" << LL_ENDL;
 		return;
 	}
 	
-- 
cgit v1.2.3


From 4ffc349b2d5c9f2e1d563b536f8aa09c0d359363 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Fri, 3 Oct 2014 12:18:15 +0300
Subject: MAINT-4345 FIXED User names are not retained when switching grids

---
 indra/newview/llpanellogin.cpp | 24 ------------------------
 1 file changed, 24 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index abdfa89f50..9861d64f9e 100755
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -213,36 +213,12 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 
 	loadLoginPage();
 
-	// Show last logged in user favorites in "Start at" combo.
-	addUsersWithFavoritesToUsername();
 	LLComboBox* username_combo(getChild<LLComboBox>("username_combo"));
 	username_combo->setTextChangedCallback(boost::bind(&LLPanelLogin::addFavoritesToStartLocation, this));
 	// STEAM-14: When user presses Enter with this field in focus, initiate login
 	username_combo->setCommitCallback(boost::bind(&LLPanelLogin::onClickConnect, this));
 }
 
-void LLPanelLogin::addUsersWithFavoritesToUsername()
-{
-	LLComboBox* combo = getChild<LLComboBox>("username_combo");
-	if (!combo) return;
-	std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "stored_favorites_" + LLGridManager::getInstance()->getGrid() + ".xml");
-	std::string old_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "stored_favorites.xml");
-	LLSD fav_llsd;
-	llifstream file;
-	file.open(filename);
-	if (!file.is_open())
-	{
-		file.open(old_filename);
-		if (!file.is_open()) return;
-	}
-	LLSDSerialize::fromXML(fav_llsd, file);
-	for (LLSD::map_const_iterator iter = fav_llsd.beginMap();
-		iter != fav_llsd.endMap(); ++iter)
-	{
-		combo->add(iter->first);
-	}
-}
-
 void LLPanelLogin::addFavoritesToStartLocation()
 {
 	// Clear the combo.
-- 
cgit v1.2.3


From d95feec8dc38dad52f5265a9abc58175019c6d18 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Fri, 3 Oct 2014 12:32:58 +0300
Subject: MAINT-4492 FIXED Danish and Polish need to be removed as choices from
 Preferences

---
 .../skins/default/xui/en/panel_preferences_general.xml     | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index ea0f7d8593..54be1522e9 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -39,12 +39,7 @@
          enabled="true"
          label="English"
          name="English"
-         value="en" />
-        <combo_box.item
-         enabled="true"
-         label="Dansk (Danish) - Beta"
-         name="Danish"
-         value="da" />
+         value="en" />        
         <combo_box.item
          enabled="true"
          label="Deutsch (German) - Beta"
@@ -64,12 +59,7 @@
          enabled="true"
          label="Italiano (Italian) - Beta"
          name="Italian"
-         value="it" />
-        <combo_box.item
-         enabled="true"
-         label="Polski (Polish) - Beta"
-         name="Polish"
-         value="pl" />
+         value="it" />        
         <combo_box.item
          enabled="true"
          label="Português (Portuguese) - Beta"
-- 
cgit v1.2.3


From a25748e11ea59d72f8190373be5b8930288d4744 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Thu, 2 Oct 2014 18:20:10 +0300
Subject: MAINT-4119 FIXED Uniquely decorate links on Second Life or Linden Lab
 domains

---
 indra/llui/lltextbase.cpp                          |  70 ++--------------
 indra/llui/lltextutil.cpp                          |  91 +++++++++++++++++++++
 indra/llui/lltextutil.h                            |  29 ++++++-
 indra/llui/llurlentry.cpp                          |  30 +++++++
 indra/llui/llurlentry.h                            |  17 ++++
 indra/llui/llurlmatch.cpp                          |   6 +-
 indra/llui/llurlmatch.h                            |   6 +-
 indra/llui/llurlregistry.cpp                       |   7 +-
 .../newview/skins/default/textures/icons/hand.png  | Bin 0 -> 957 bytes
 indra/newview/skins/default/textures/textures.xml  |   2 +
 10 files changed, 191 insertions(+), 67 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/hand.png

(limited to 'indra')

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 8395e74715..fee271b943 100755
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -44,8 +44,6 @@
 #include "llwindow.h"
 #include <boost/bind.hpp>
 
-#include "uriparser/Uri.h"
-
 const F32	CURSOR_FLASH_DELAY = 1.0f;  // in seconds
 const S32	CURSOR_THICKNESS = 2;
 const F32	TRIPLE_CLICK_INTERVAL = 0.3f;	// delay between double and triple click.
@@ -2021,60 +2019,7 @@ static LLUIImagePtr image_from_icon_name(const std::string& icon_name)
 
 static LLTrace::BlockTimerStatHandle FTM_PARSE_HTML("Parse HTML");
 
-S32 LLTextBase::normalizeUri(std::string& uri_string)
-{
-	UriParserStateA state;
-	UriUriA uri;
-	state.uri = &uri;
-
-	S32 res = uriParseUriA(&state, uri_string.c_str());
-
-	if (!res)	
-	{
-		if (uri.scheme.afterLast - uri.scheme.first > 0)
-		{
-			res = uriNormalizeSyntaxExA(&uri, URI_NORMALIZE_SCHEME | URI_NORMALIZE_HOST);
 
-			if (!res)
-			{
-				S32 chars_required;
-				res = uriToStringCharsRequiredA(&uri, &chars_required);
-
-				if (!res)
-				{
-					chars_required++;
-					std::vector<char> label_buf(chars_required);
-					res = uriToStringA(&label_buf[0], &uri, chars_required, NULL);
-
-					if (!res)
-					{
-						uri_string = &label_buf[0];
-					}
-				}
-			}
-		}
-		else if (uri_string.find_first_of('.') != std::string::npos)
-		{
-			static bool recursive_call = false;
-
-			// allow only single level recursive call
-			if (!recursive_call)
-			{
-				recursive_call = true;
-
-				// force uri to be with scheme and try to normalize
-				std::string uri_with_scheme = "http://";
-				uri_with_scheme += uri_string;
-				normalizeUri(uri_with_scheme);
-				uri_string = uri_with_scheme.substr(7);
-				recursive_call = false;
-			}		
-		}
-	}
-
-	uriFreeUriMembersA(&uri);
-	return res;
-}
 
 void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Params& input_params)
 {
@@ -2113,8 +2058,11 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para
 				appendAndHighlightText(subtext, part, style_params); 
 			}
 
+			// add icon before url if need
+			LLTextUtil::processUrlMatch(&match, this, isContentTrusted() || match.isTrusted());
+
 			std::string label = match.getLabel();
-			normalizeUri(label);
+			LLTextUtil::normalizeUri(label);
 
 			// output the styled Url
 			appendAndHighlightTextImpl(label, part, link_params, match.underlineOnHoverOnly());
@@ -2124,14 +2072,12 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para
 			{
 				segment_set_t::iterator it = getSegIterContaining(getLength()-1);
 				if (it != mSegments.end())
-					{
-						LLTextSegmentPtr segment = *it;
-						segment->setToolTip(match.getTooltip());
-					}
+				{
+					LLTextSegmentPtr segment = *it;
+					segment->setToolTip(match.getTooltip());
+				}
 			}
 
-			LLTextUtil::processUrlMatch(&match,this,isContentTrusted());
-
 			// move on to the rest of the text after the Url
 			if (end < (S32)text.length()) 
 			{
diff --git a/indra/llui/lltextutil.cpp b/indra/llui/lltextutil.cpp
index fff04b34f2..b67daf427b 100755
--- a/indra/llui/lltextutil.cpp
+++ b/indra/llui/lltextutil.cpp
@@ -30,6 +30,8 @@
 #include "lltextbox.h"
 #include "llurlmatch.h"
 
+#include "uriparser/Uri.h"
+
 boost::function<bool(LLUrlMatch*,LLTextBase*)>	LLTextUtil::TextHelpers::iconCallbackCreationFunction = 0;
 
 void LLTextUtil::textboxSetHighlightedVal(LLTextBox *txtbox, const LLStyle::Params& normal_style, const std::string& text, const std::string& hl)
@@ -104,4 +106,93 @@ bool LLTextUtil::processUrlMatch(LLUrlMatch* match,LLTextBase* text_base, bool i
 	return false;
 }
 
+static void textRangeToString(UriTextRangeA& textRange, std::string& str)
+{
+	S32 len = textRange.afterLast - textRange.first;
+	if (len)
+	{
+		str = textRange.first;
+		str = str.substr(0, len);
+	}
+}
+
+S32 LLTextUtil::normalizeUri(std::string& uri_string, Uri * urip/* = NULL*/)
+{
+	UriParserStateA state;
+	UriUriA uri;
+	state.uri = &uri;
+
+	S32 res = uriParseUriA(&state, uri_string.c_str());
+
+	if (!res)	
+	{
+		S32 len = uri.scheme.afterLast - uri.scheme.first;
+
+		if (len > 0)
+		{
+			res = uriNormalizeSyntaxExA(&uri, URI_NORMALIZE_SCHEME | URI_NORMALIZE_HOST);
+
+			if (!res)
+			{
+				S32 chars_required;
+				res = uriToStringCharsRequiredA(&uri, &chars_required);
+
+				if (!res)
+				{
+					chars_required++;
+					std::vector<char> label_buf(chars_required);
+					res = uriToStringA(&label_buf[0], &uri, chars_required, NULL);
+
+					if (!res)
+					{
+						uri_string = &label_buf[0];
+					}
+				}
+			}
+
+			// fill urip if requested
+			if (urip)
+			{
+				textRangeToString(uri.scheme, urip->scheme);
+				textRangeToString(uri.hostText, urip->host);
+				textRangeToString(uri.portText, urip->port);
+				textRangeToString(uri.query, urip->query);
+				textRangeToString(uri.fragment, urip->fragment);
+
+				UriPathSegmentA * pathHead = uri.pathHead;
+				while (pathHead)
+				{
+					std::string partOfPath;
+					textRangeToString(pathHead->text, partOfPath);
+
+					urip->path += '/';
+					urip->path += partOfPath;
+
+					pathHead = pathHead->next;
+				}
+			}
+		}
+		else if (uri_string.find_first_of('.') != std::string::npos)
+		{
+			static bool recursive_call = false;
+
+			// allow only single level recursive call
+			if (!recursive_call)
+			{
+				recursive_call = true;
+
+				// force uri to be with scheme and try to normalize
+				std::string uri_with_scheme = "http://";
+				uri_with_scheme += uri_string;
+				normalizeUri(uri_with_scheme, urip);
+				uri_string = uri_with_scheme.substr(7);
+				recursive_call = false;
+			}		
+		}
+	}
+
+	uriFreeUriMembersA(&uri);
+	return res;
+}
+
 // EOF
diff --git a/indra/llui/lltextutil.h b/indra/llui/lltextutil.h
index 798f14d086..176b4ba071 100755
--- a/indra/llui/lltextutil.h
+++ b/indra/llui/lltextutil.h
@@ -64,7 +64,34 @@ namespace LLTextUtil
 	 */
 	const std::string& formatPhoneNumber(const std::string& phone_str);
 
-	bool processUrlMatch(LLUrlMatch* match,LLTextBase* text_base, bool is_content_trusted);
+	/**
+	 * Adds icon before url if need.
+	 *
+	 * @param[in] match an object with results of matching
+	 * @param[in] text_base pointer to UI text object
+	 * @param[in] is_content_trusted true if context is trusted
+	 * @return reference to string with formatted phone number
+	 */
+	bool processUrlMatch(LLUrlMatch* match, LLTextBase* text_base, bool is_content_trusted);
+
+	typedef struct
+	{
+		std::string scheme;
+		std::string host;
+		std::string port;
+		std::string path;
+		std::string query;
+		std::string fragment;
+	} Uri;
+
+	/**
+	 * Translates uri's host name and scheme to lowercase
+	 *
+	 * @param[in, out] uri_string string with original uri
+	 * @param[out] uri receives parts of uri
+	 * @return 0 on success, error code otherwise
+	 */
+	S32 normalizeUri(std::string& uri_string, Uri * uri = NULL);
 
 	class TextHelpers
 	{
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index be583c83d8..3ebf06eefa 100755
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -35,6 +35,7 @@
 #include "llavatarnamecache.h"
 #include "llcachename.h"
 #include "lltrans.h"
+#include "lltextutil.h"
 #include "lluicolortable.h"
 #include "message.h"
 
@@ -341,6 +342,35 @@ std::string LLUrlEntrySLURL::getLocation(const std::string &url) const
 	return url.substr(pos, url.size() - pos);
 }
 
+//
+// LLUrlEntrySeconlifeURLs Describes *secondlife.com and *lindenlab.com urls to substitute icon 'hand.png' before link
+//
+LLUrlEntrySeconlifeURL::LLUrlEntrySeconlifeURL()
+{
+	mPattern = boost::regex("\\b(https?://)?([-\\w\\.]*\\.)?(secondlife|lindenlab)\\.com\\S*",
+		boost::regex::perl|boost::regex::icase);
+	
+	mIcon = "Hand";
+	mMenuName = "menu_url_http.xml";
+}
+
+std::string LLUrlEntrySeconlifeURL::getLabel(const std::string &url, const LLUrlLabelCallback &cb)
+{
+	std::string local_url(url);
+
+	LLTextUtil::Uri uri;
+	LLTextUtil::normalizeUri(local_url, &uri);
+
+	return uri.host;
+}
+
+std::string LLUrlEntrySeconlifeURL::getTooltip(const std::string &url) const
+{
+	std::string local_url(url);
+	LLTextUtil::normalizeUri(local_url);
+	return local_url;
+}
+
 //
 // LLUrlEntryAgent Describes a Second Life agent Url, e.g.,
 // secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index ffcd45dfde..f75d773803 100755
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -96,6 +96,8 @@ public:
 	/// Should this link text be underlined only when mouse is hovered over it?
 	virtual bool underlineOnHoverOnly(const std::string &string) const { return false; }
 
+	virtual bool isTrusted() const { return false; }
+
 	virtual LLUUID	getID(const std::string &string) const { return LLUUID::null; }
 
 	bool isLinkDisabled() const;
@@ -167,6 +169,21 @@ public:
 	/*virtual*/ std::string getLocation(const std::string &url) const;
 };
 
+///
+/// LLUrlEntrySeconlifeURLs Describes *secondlife.com and *lindenlab.com Urls
+///
+class LLUrlEntrySeconlifeURL : public LLUrlEntryBase
+{
+public:
+	LLUrlEntrySeconlifeURL();
+	virtual bool isTrusted() const { return true; }
+	virtual std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb);
+	virtual std::string getTooltip(const std::string &url) const;
+
+private:
+	std::string mLabel;
+};
+
 ///
 /// LLUrlEntryAgent Describes a Second Life agent Url, e.g.,
 /// secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
diff --git a/indra/llui/llurlmatch.cpp b/indra/llui/llurlmatch.cpp
index c1f1382a9f..016d1ca92d 100755
--- a/indra/llui/llurlmatch.cpp
+++ b/indra/llui/llurlmatch.cpp
@@ -37,7 +37,8 @@ LLUrlMatch::LLUrlMatch() :
 	mIcon(""),
 	mMenuName(""),
 	mLocation(""),
-	mUnderlineOnHoverOnly(false)
+	mUnderlineOnHoverOnly(false),
+	mTrusted(false)
 {
 }
 
@@ -45,7 +46,7 @@ void LLUrlMatch::setValues(U32 start, U32 end, const std::string &url,
 						   const std::string &label, const std::string &tooltip,
 						   const std::string &icon, const LLStyle::Params& style,
 						   const std::string &menu, const std::string &location,
-						   const LLUUID& id, bool underline_on_hover_only)
+						   const LLUUID& id, bool underline_on_hover_only, bool trusted)
 {
 	mStart = start;
 	mEnd = end;
@@ -59,4 +60,5 @@ void LLUrlMatch::setValues(U32 start, U32 end, const std::string &url,
 	mLocation = location;
 	mID = id;
 	mUnderlineOnHoverOnly = underline_on_hover_only;
+	mTrusted = trusted;
 }
diff --git a/indra/llui/llurlmatch.h b/indra/llui/llurlmatch.h
index 2818f45207..9f8960b32f 100755
--- a/indra/llui/llurlmatch.h
+++ b/indra/llui/llurlmatch.h
@@ -80,12 +80,15 @@ public:
 	/// Should this link text be underlined only when mouse is hovered over it?
 	bool underlineOnHoverOnly() const { return mUnderlineOnHoverOnly; }
 
+	/// Return true if Url is trusted.
+	bool isTrusted() const { return mTrusted; }
+
 	/// Change the contents of this match object (used by LLUrlRegistry)
 	void setValues(U32 start, U32 end, const std::string &url, const std::string &label,
 	               const std::string &tooltip, const std::string &icon,
 				   const LLStyle::Params& style, const std::string &menu, 
 				   const std::string &location, const LLUUID& id,
-				   bool underline_on_hover_only = false );
+				   bool underline_on_hover_only = false, bool trusted = false );
 
 	const LLUUID& getID() const { return mID; }
 private:
@@ -100,6 +103,7 @@ private:
 	LLUUID		mID;
 	LLStyle::Params mStyle;
 	bool		mUnderlineOnHoverOnly;
+	bool		mTrusted;
 };
 
 #endif
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp
index ef0789e0e4..462b3d6979 100755
--- a/indra/llui/llurlregistry.cpp
+++ b/indra/llui/llurlregistry.cpp
@@ -44,6 +44,10 @@ LLUrlRegistry::LLUrlRegistry()
 	mUrlEntryIcon = new LLUrlEntryIcon();
 	registerUrl(mUrlEntryIcon);
 	registerUrl(new LLUrlEntrySLURL());
+
+	// decorated links for host names like: secondlife.com and lindenlab.com
+	registerUrl(new LLUrlEntrySeconlifeURL());
+
 	registerUrl(new LLUrlEntryHTTP());
 	mUrlEntryHTTPLabel = new LLUrlEntryHTTPLabel();
 	registerUrl(mUrlEntryHTTPLabel);
@@ -212,7 +216,8 @@ bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LL
 						match_entry->getMenuName(),
 						match_entry->getLocation(url),
 						match_entry->getID(url),
-						match_entry->underlineOnHoverOnly(url));
+						match_entry->underlineOnHoverOnly(url),
+						match_entry->isTrusted());
 		return true;
 	}
 
diff --git a/indra/newview/skins/default/textures/icons/hand.png b/indra/newview/skins/default/textures/icons/hand.png
new file mode 100644
index 0000000000..41b9600da6
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/hand.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 46698b3949..8fdc770009 100755
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -229,6 +229,8 @@ with the same filename but different name
   <texture name="Generic_Person" file_name="icons/Generic_Person.png" preload="false" />
   <texture name="Generic_Person_Large" file_name="icons/Generic_Person_Large.png" preload="false" />
 
+  <texture name="Hand" file_name="icons/hand.png" preload="false" />
+  
   <texture name="Help_Press" file_name="navbar/Help_Press.png" preload="false" />
 
   <texture name="Hierarchy_View_Disabled" file_name="icons/Hierarchy_View_Disabled.png" preload="false" />
-- 
cgit v1.2.3


From 16e35c5913086e1bef26a650bd60319d5a97d51f Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Fri, 3 Oct 2014 19:42:34 +0300
Subject: MAINT-3959 FIXED Prim size reverting to default size when scaled down
 and shift copied

---
 indra/newview/llpanelobject.cpp | 6 ++++--
 indra/newview/llpanelobject.h   | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 9123252f4c..2fece32449 100755
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -285,7 +285,8 @@ LLPanelObject::LLPanelObject()
 	mIsPhantom(FALSE),
 	mSelectedType(MI_BOX),
 	mSculptTextureRevert(LLUUID::null),
-	mSculptTypeRevert(0)
+	mSculptTypeRevert(0),
+	mSizeChanged(FALSE)
 {
 }
 
@@ -1620,9 +1621,10 @@ void LLPanelObject::sendScale(BOOL btn_down)
 	LLVector3 newscale(mCtrlScaleX->get(), mCtrlScaleY->get(), mCtrlScaleZ->get());
 
 	LLVector3 delta = newscale - mObject->getScale();
-	if (delta.magVec() >= 0.0005f)
+	if (delta.magVec() >= 0.0005f || (mSizeChanged && !btn_down))
 	{
 		// scale changed by more than 1/2 millimeter
+		mSizeChanged = btn_down;
 
 		// check to see if we aren't scaling the textures
 		// (in which case the tex coord's need to be recomputed)
diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h
index c4cf27ab1a..8829f493fa 100755
--- a/indra/newview/llpanelobject.h
+++ b/indra/newview/llpanelobject.h
@@ -140,6 +140,7 @@ protected:
 	LLSpinCtrl*		mCtrlScaleX;
 	LLSpinCtrl*		mCtrlScaleY;
 	LLSpinCtrl*		mCtrlScaleZ;
+	BOOL			mSizeChanged;
 
 	LLTextBox*		mLabelRotation;
 	LLSpinCtrl*		mCtrlRotX;
-- 
cgit v1.2.3


From 68e561cf17da0ce32eb16d4999f2315e326f6ee1 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Mon, 6 Oct 2014 17:21:27 +0300
Subject: MAINT-3941 Left-clicking on the "Mute when minimized" label doesn't
 toggles the display of the check mark

---
 indra/newview/skins/default/xui/en/panel_preferences_sound.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index b71586aab1..615abbaa89 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -398,7 +398,7 @@
      follows="left|top"
      layout="topleft"
      left_delta="-168"
-     width="221"
+     width="360"
      height="20"
      name="ear_location">
     <radio_item
-- 
cgit v1.2.3


From 6ea75fd4b03ce3a9155781764c9bcf13a637b749 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Tue, 7 Oct 2014 18:59:11 +0300
Subject: MAINT-4548 & MAINT-4557 FIXED build issues

---
 indra/llcommon/CMakeLists.txt  |   5 +
 indra/llcommon/lluriparser.cpp | 228 +++++++++++++++++++++++++++++++++++++++++
 indra/llcommon/lluriparser.h   |  84 +++++++++++++++
 indra/llui/CMakeLists.txt      |   3 -
 indra/llui/lltextbase.cpp      |   7 +-
 indra/llui/lltextutil.cpp      |  91 ----------------
 indra/llui/lltextutil.h        |  19 ----
 indra/llui/llurlentry.cpp      |  21 ++--
 indra/llui/llurlentry.h        |   6 +-
 indra/llui/llurlregistry.cpp   |   6 ++
 10 files changed, 338 insertions(+), 132 deletions(-)
 create mode 100644 indra/llcommon/lluriparser.cpp
 create mode 100644 indra/llcommon/lluriparser.h

(limited to 'indra')

diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 763f5a3521..debb42fb5f 100755
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -12,12 +12,14 @@ include(GoogleBreakpad)
 include(GooglePerfTools)
 include(Copy3rdPartyLibs)
 include(ZLIB)
+include(URIPARSER)
 
 include_directories(
     ${EXPAT_INCLUDE_DIRS}
     ${LLCOMMON_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIRS}
     ${BREAKPAD_INCLUDE_DIRECTORIES}
+    ${URIPARSER_INCLUDE_DIRS}
     )
 
 # add_executable(lltreeiterators lltreeiterators.cpp)
@@ -103,6 +105,7 @@ set(llcommon_SOURCE_FILES
     lltracerecording.cpp
     lltracethreadrecorder.cpp
     lluri.cpp
+    lluriparser.cpp
     lluuid.cpp
     llworkerthread.cpp
     timing.cpp
@@ -217,6 +220,7 @@ set(llcommon_HEADER_FILES
     llunits.h
     llunittype.h
     lluri.h
+    lluriparser.h
     lluuid.h
     llwin32headers.h
     llwin32headerslean.h
@@ -261,6 +265,7 @@ target_link_libraries(
     ${BOOST_PROGRAM_OPTIONS_LIBRARY}
     ${BOOST_REGEX_LIBRARY}
     ${GOOGLE_PERFTOOLS_LIBRARIES}
+    ${URIPARSER_LIBRARIES}
     )
 
 if (DARWIN)
diff --git a/indra/llcommon/lluriparser.cpp b/indra/llcommon/lluriparser.cpp
new file mode 100644
index 0000000000..ef4481d32f
--- /dev/null
+++ b/indra/llcommon/lluriparser.cpp
@@ -0,0 +1,228 @@
+/** 
+ * @file lluriparser.cpp
+ * @author Protey
+ * @date 2014-10-07
+ * @brief Implementation of the LLUriParser class.
+ *
+ * $LicenseInfo:firstyear=2014&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2014, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+#include "lluriparser.h"
+
+LLUriParser::LLUriParser(const std::string& u) : mTmpScheme(false), mRes(0)
+{
+	mState.uri = &mUri;
+
+	if (u.find("://") == std::string::npos)
+	{
+		mNormalizedUri = "http://";
+		mTmpScheme = true;
+	}
+
+	mNormalizedUri += u.c_str();
+
+	mRes = parse();
+}
+
+LLUriParser::~LLUriParser()
+{
+	uriFreeUriMembersA(&mUri);
+}
+
+S32 LLUriParser::parse()
+{
+	mRes = uriParseUriA(&mState, mNormalizedUri.c_str());
+	return mRes;
+}
+
+const char * LLUriParser::scheme() const
+{
+	return mScheme.c_str();
+}
+
+void LLUriParser::sheme(const std::string& s)
+{
+	mTmpScheme = !s.size();
+	mScheme = s;
+}
+
+const char * LLUriParser::port() const
+{
+	return mPort.c_str();
+}
+
+void LLUriParser::port(const std::string& s)
+{
+	mPort = s;
+}
+
+const char * LLUriParser::host() const
+{
+	return mHost.c_str();
+}
+
+void LLUriParser::host(const std::string& s)
+{
+	mHost = s;
+}
+
+const char * LLUriParser::path() const
+{
+	return mPath.c_str();
+}
+
+void LLUriParser::path(const std::string& s)
+{
+	mPath = s;
+}
+
+const char * LLUriParser::query() const
+{
+	return mQuery.c_str();
+}
+
+void LLUriParser::query(const std::string& s)
+{
+	mQuery = s;
+}
+
+const char * LLUriParser::fragment() const
+{
+	return mFragment.c_str();
+}
+
+void LLUriParser::fragment(const std::string& s)
+{
+	mFragment = s;
+}
+
+void LLUriParser::textRangeToString(UriTextRangeA& textRange, std::string& str)
+{
+	S32 len = textRange.afterLast - textRange.first;
+	if (len)
+	{
+		str = textRange.first;
+		str = str.substr(0, len);
+	}
+}
+
+void LLUriParser::extractParts()
+{
+	if (mTmpScheme)
+	{
+		mScheme.clear();
+	}
+	else
+	{
+		textRangeToString(mUri.scheme, mScheme);
+	}
+	
+	textRangeToString(mUri.hostText, mHost);
+	textRangeToString(mUri.portText, mPort);
+	textRangeToString(mUri.query, mQuery);
+	textRangeToString(mUri.fragment, mFragment);
+
+	UriPathSegmentA * pathHead = mUri.pathHead;
+	while (pathHead)
+	{
+		std::string partOfPath;
+		textRangeToString(pathHead->text, partOfPath);
+
+		mPath += '/';
+		mPath += partOfPath;
+
+		pathHead = pathHead->next;
+	}
+}
+
+S32 LLUriParser::normalize()
+{
+	if (!mRes)
+	{
+		mRes = uriNormalizeSyntaxExA(&mUri, URI_NORMALIZE_SCHEME | URI_NORMALIZE_HOST);
+
+		if (!mRes)
+		{
+			S32 chars_required;
+			mRes = uriToStringCharsRequiredA(&mUri, &chars_required);
+
+			if (!mRes)
+			{
+				chars_required++;
+				std::vector<char> label_buf(chars_required);
+				mRes = uriToStringA(&label_buf[0], &mUri, chars_required, NULL);
+
+				if (!mRes)
+				{
+					mNormalizedUri = &label_buf[mTmpScheme ? 7 : 0];
+				}
+			}
+		}
+	}
+
+	return mRes;
+}
+
+void LLUriParser::glue(std::string& uri) const
+{
+	if (mScheme.size())
+	{
+		uri = mScheme;
+		uri += "://";
+	}
+
+	uri += mHost;
+
+	if (mPort.size())
+	{
+		uri += ':';
+		uri += mPort;
+	}
+
+	uri += mPath;
+
+	if (mQuery.size())
+	{
+		uri += '?';
+		uri += mQuery;
+
+		if (mFragment.size())
+		{
+			uri += '#';
+			uri += mFragment;
+		}
+	}
+}
+
+bool LLUriParser::test() const
+{
+	std::string uri;
+	glue(uri);
+
+	return uri == mNormalizedUri;
+}
+
+const char * LLUriParser::normalizedUri() const
+{
+	return mNormalizedUri.c_str();
+}
diff --git a/indra/llcommon/lluriparser.h b/indra/llcommon/lluriparser.h
new file mode 100644
index 0000000000..719f916837
--- /dev/null
+++ b/indra/llcommon/lluriparser.h
@@ -0,0 +1,84 @@
+/** 
+ * @file lluriparser.h
+ * @author Protey
+ * @date 20146-10-07
+ * @brief Declaration of the UriParser class.
+ *
+ * $LicenseInfo:firstyear=2014&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2014, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLURIPARSER_H
+#define LL_LLURIPARSER_H
+
+#include <string>
+#include "uriparser/Uri.h"
+
+class LL_COMMON_API LLUriParser
+{
+public:
+	LLUriParser(const std::string& u);
+	virtual ~LLUriParser();
+
+	const char * scheme() const;
+	void sheme (const std::string& s);
+
+	const char * port() const;
+	void port (const std::string& s);
+
+	const char * host() const;
+	void host (const std::string& s);
+
+	const char * path() const;
+	void path (const std::string& s);
+
+	const char * query() const;
+	void query (const std::string& s);
+
+	const char * fragment() const;
+	void fragment (const std::string& s);
+
+	const char * normalizedUri() const;
+
+	void extractParts();
+	void glue(std::string& uri) const;
+	bool test() const;
+	S32 normalize();
+
+private:
+	S32 parse();
+	void textRangeToString(UriTextRangeA& textRange, std::string& str);
+	std::string mScheme;
+	std::string mHost;
+	std::string mPort;
+	std::string mPath;
+	std::string mQuery;
+	std::string mFragment;
+	std::string mNormalizedUri;
+
+	UriParserStateA mState;
+	UriUriA mUri;
+
+	S32 mRes;
+	bool mTmpScheme;
+};
+
+#endif // LL_LLURIPARSER_H
diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index 24fdc2268d..52738aeb6f 100755
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -12,7 +12,6 @@ include(LLRender)
 include(LLWindow)
 include(LLVFS)
 include(LLXML)
-include(URIPARSER)
 
 include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
@@ -29,7 +28,6 @@ include_directories(
 include_directories(SYSTEM
     ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
     ${LLXML_SYSTEM_INCLUDE_DIRS}
-    ${URIPARSER_INCLUDE_DIRS}
     )
 
 set(llui_SOURCE_FILES
@@ -280,7 +278,6 @@ target_link_libraries(llui
     ${LLXML_LIBRARIES}
     ${LLMATH_LIBRARIES}
     ${HUNSPELL_LIBRARY}
-    ${URIPARSER_LIBRARIES}
     ${LLCOMMON_LIBRARIES} # must be after llimage, llwindow, llrender
     )
 
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index fee271b943..09f923e74f 100755
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -38,6 +38,7 @@
 #include "lltextutil.h"
 #include "lltooltip.h"
 #include "lluictrl.h"
+#include "lluriparser.h"
 #include "llurlaction.h"
 #include "llurlregistry.h"
 #include "llview.h"
@@ -2061,11 +2062,9 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para
 			// add icon before url if need
 			LLTextUtil::processUrlMatch(&match, this, isContentTrusted() || match.isTrusted());
 
-			std::string label = match.getLabel();
-			LLTextUtil::normalizeUri(label);
-
 			// output the styled Url
-			appendAndHighlightTextImpl(label, part, link_params, match.underlineOnHoverOnly());
+			//appendAndHighlightTextImpl(label, part, link_params, match.underlineOnHoverOnly());
+			appendAndHighlightTextImpl(match.getLabel(), part, link_params, match.underlineOnHoverOnly());
 			
 			// set the tooltip for the Url label
 			if (! match.getTooltip().empty())
diff --git a/indra/llui/lltextutil.cpp b/indra/llui/lltextutil.cpp
index b67daf427b..fff04b34f2 100755
--- a/indra/llui/lltextutil.cpp
+++ b/indra/llui/lltextutil.cpp
@@ -30,8 +30,6 @@
 #include "lltextbox.h"
 #include "llurlmatch.h"
 
-#include "uriparser/Uri.h"
-
 boost::function<bool(LLUrlMatch*,LLTextBase*)>	LLTextUtil::TextHelpers::iconCallbackCreationFunction = 0;
 
 void LLTextUtil::textboxSetHighlightedVal(LLTextBox *txtbox, const LLStyle::Params& normal_style, const std::string& text, const std::string& hl)
@@ -106,93 +104,4 @@ bool LLTextUtil::processUrlMatch(LLUrlMatch* match,LLTextBase* text_base, bool i
 	return false;
 }
 
-static void textRangeToString(UriTextRangeA& textRange, std::string& str)
-{
-	S32 len = textRange.afterLast - textRange.first;
-	if (len)
-	{
-		str = textRange.first;
-		str = str.substr(0, len);
-	}
-}
-
-S32 LLTextUtil::normalizeUri(std::string& uri_string, Uri * urip/* = NULL*/)
-{
-	UriParserStateA state;
-	UriUriA uri;
-	state.uri = &uri;
-
-	S32 res = uriParseUriA(&state, uri_string.c_str());
-
-	if (!res)	
-	{
-		S32 len = uri.scheme.afterLast - uri.scheme.first;
-
-		if (len > 0)
-		{
-			res = uriNormalizeSyntaxExA(&uri, URI_NORMALIZE_SCHEME | URI_NORMALIZE_HOST);
-
-			if (!res)
-			{
-				S32 chars_required;
-				res = uriToStringCharsRequiredA(&uri, &chars_required);
-
-				if (!res)
-				{
-					chars_required++;
-					std::vector<char> label_buf(chars_required);
-					res = uriToStringA(&label_buf[0], &uri, chars_required, NULL);
-
-					if (!res)
-					{
-						uri_string = &label_buf[0];
-					}
-				}
-			}
-
-			// fill urip if requested
-			if (urip)
-			{
-				textRangeToString(uri.scheme, urip->scheme);
-				textRangeToString(uri.hostText, urip->host);
-				textRangeToString(uri.portText, urip->port);
-				textRangeToString(uri.query, urip->query);
-				textRangeToString(uri.fragment, urip->fragment);
-
-				UriPathSegmentA * pathHead = uri.pathHead;
-				while (pathHead)
-				{
-					std::string partOfPath;
-					textRangeToString(pathHead->text, partOfPath);
-
-					urip->path += '/';
-					urip->path += partOfPath;
-
-					pathHead = pathHead->next;
-				}
-			}
-		}
-		else if (uri_string.find_first_of('.') != std::string::npos)
-		{
-			static bool recursive_call = false;
-
-			// allow only single level recursive call
-			if (!recursive_call)
-			{
-				recursive_call = true;
-
-				// force uri to be with scheme and try to normalize
-				std::string uri_with_scheme = "http://";
-				uri_with_scheme += uri_string;
-				normalizeUri(uri_with_scheme, urip);
-				uri_string = uri_with_scheme.substr(7);
-				recursive_call = false;
-			}		
-		}
-	}
-
-	uriFreeUriMembersA(&uri);
-	return res;
-}
-
 // EOF
diff --git a/indra/llui/lltextutil.h b/indra/llui/lltextutil.h
index 176b4ba071..1be81ffd62 100755
--- a/indra/llui/lltextutil.h
+++ b/indra/llui/lltextutil.h
@@ -74,25 +74,6 @@ namespace LLTextUtil
 	 */
 	bool processUrlMatch(LLUrlMatch* match, LLTextBase* text_base, bool is_content_trusted);
 
-	typedef struct
-	{
-		std::string scheme;
-		std::string host;
-		std::string port;
-		std::string path;
-		std::string query;
-		std::string fragment;
-	} Uri;
-
-	/**
-	 * Translates uri's host name and scheme to lowercase
-	 *
-	 * @param[in, out] uri_string string with original uri
-	 * @param[out] uri receives parts of uri
-	 * @return 0 on success, error code otherwise
-	 */
-	S32 normalizeUri(std::string& uri_string, Uri * uri = NULL);
-
 	class TextHelpers
 	{
 
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 3ebf06eefa..c06d6144b9 100755
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -31,14 +31,16 @@
 #include "lluri.h"
 #include "llurlmatch.h"
 #include "llurlregistry.h"
+#include "lluriparser.h"
 
 #include "llavatarnamecache.h"
 #include "llcachename.h"
 #include "lltrans.h"
-#include "lltextutil.h"
 #include "lluicolortable.h"
 #include "message.h"
 
+#include "uriparser/Uri.h"
+
 #define APP_HEADER_REGEX "((x-grid-location-info://[-\\w\\.]+/app)|(secondlife:///app))"
 
 // Utility functions
@@ -346,8 +348,8 @@ std::string LLUrlEntrySLURL::getLocation(const std::string &url) const
 // LLUrlEntrySeconlifeURLs Describes *secondlife.com and *lindenlab.com urls to substitute icon 'hand.png' before link
 //
 LLUrlEntrySeconlifeURL::LLUrlEntrySeconlifeURL()
-{
-	mPattern = boost::regex("\\b(https?://)?([-\\w\\.]*\\.)?(secondlife|lindenlab)\\.com\\S*",
+{ 
+	mPattern = boost::regex("\\b(https?://)?([-\\w\\.]*\\.)?(secondlife|lindenlab)\\.com(:\\d{1,5})?(/\\S*)?\\b",
 		boost::regex::perl|boost::regex::icase);
 	
 	mIcon = "Hand";
@@ -356,19 +358,14 @@ LLUrlEntrySeconlifeURL::LLUrlEntrySeconlifeURL()
 
 std::string LLUrlEntrySeconlifeURL::getLabel(const std::string &url, const LLUrlLabelCallback &cb)
 {
-	std::string local_url(url);
-
-	LLTextUtil::Uri uri;
-	LLTextUtil::normalizeUri(local_url, &uri);
-
-	return uri.host;
+	LLUriParser up(url);
+	up.extractParts();
+	return up.host();
 }
 
 std::string LLUrlEntrySeconlifeURL::getTooltip(const std::string &url) const
 {
-	std::string local_url(url);
-	LLTextUtil::normalizeUri(local_url);
-	return local_url;
+	return url;
 }
 
 //
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index f75d773803..1cb11cdb1c 100755
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -176,9 +176,9 @@ class LLUrlEntrySeconlifeURL : public LLUrlEntryBase
 {
 public:
 	LLUrlEntrySeconlifeURL();
-	virtual bool isTrusted() const { return true; }
-	virtual std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb);
-	virtual std::string getTooltip(const std::string &url) const;
+	bool isTrusted() const { return true; }
+	/*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb);
+	/*virtual*/ std::string getTooltip(const std::string &url) const;
 
 private:
 	std::string mLabel;
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp
index 462b3d6979..9e8d8d01f1 100755
--- a/indra/llui/llurlregistry.cpp
+++ b/indra/llui/llurlregistry.cpp
@@ -27,6 +27,7 @@
 
 #include "linden_common.h"
 #include "llurlregistry.h"
+#include "lluriparser.h"
 
 #include <boost/regex.hpp>
 
@@ -207,6 +208,11 @@ bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LL
 	{
 		// fill in the LLUrlMatch object and return it
 		std::string url = text.substr(match_start, match_end - match_start + 1);
+
+		LLUriParser up(url);
+		up.normalize();
+		url = up.normalizedUri();
+
 		match.setValues(match_start, match_end,
 						match_entry->getUrl(url),
 						match_entry->getLabel(url, cb),
-- 
cgit v1.2.3


From 75d81151c2f380ed92e39ab0278adc21224d911c Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 9 Oct 2014 17:19:27 +0300
Subject: MAINT-2565 FIXED Show texture information in one toast

---
 indra/newview/llviewermenu.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 3cc4858226..ecf5cc2886 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -7021,10 +7021,6 @@ void handle_selected_texture_info(void*)
    		std::string msg;
    		msg.assign("Texture info for: ");
    		msg.append(node->mName);
-
-		LLSD args;
-		args["MESSAGE"] = msg;
-		LLNotificationsUtil::add("SystemMessage", args);
 	   
    		U8 te_count = node->getObject()->getNumTEs();
    		// map from texture ID to list of faces using it
@@ -7048,10 +7044,10 @@ void handle_selected_texture_info(void*)
    			S32 height = img->getHeight();
    			S32 width = img->getWidth();
    			S32 components = img->getComponents();
-   			msg = llformat("%dx%d %s on face ",
+   			msg.append(llformat("\n%dx%d %s on face ",
    								width,
    								height,
-   								(components == 4 ? "alpha" : "opaque"));
+   								(components == 4 ? "alpha" : "opaque")));
    			for (U8 i = 0; i < it->second.size(); ++i)
    			{
    				msg.append( llformat("%d ", (S32)(it->second[i])));
-- 
cgit v1.2.3


From 33a0b873a5cd1a9379eb1edfc0551b8c7648698c Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 9 Oct 2014 17:28:16 +0300
Subject: MAINT-2560 FIXED Show name of source avatar above crosshair

---
 indra/newview/llhudeffectlookat.cpp | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llhudeffectlookat.cpp b/indra/newview/llhudeffectlookat.cpp
index f3a48625a4..fadbf78ca5 100755
--- a/indra/newview/llhudeffectlookat.cpp
+++ b/indra/newview/llhudeffectlookat.cpp
@@ -39,8 +39,8 @@
 #include "llrendersphere.h"
 #include "llselectmgr.h"
 #include "llglheaders.h"
-
-
+#include "llfontgl.h"
+#include "llhudrender.h"
 #include "llxmltree.h"
 
 
@@ -497,14 +497,15 @@ void LLHUDEffectLookAt::render()
 	{
 		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
-		LLVector3 target = mTargetPos + ((LLVOAvatar*)(LLViewerObject*)mSourceObject)->mHeadp->getWorldPosition();
+		LLVOAvatar* source_avatar = ((LLVOAvatar*)(LLViewerObject*)mSourceObject);
+		LLVector3 target = mTargetPos + source_avatar->mHeadp->getWorldPosition();
 		gGL.matrixMode(LLRender::MM_MODELVIEW);
 		gGL.pushMatrix();
 		gGL.translatef(target.mV[VX], target.mV[VY], target.mV[VZ]);
 		gGL.scalef(0.3f, 0.3f, 0.3f);
+		LLColor3 color = (*mAttentions)[mTargetType].mColor;
 		gGL.begin(LLRender::LINES);
 		{
-			LLColor3 color = (*mAttentions)[mTargetType].mColor;
 			gGL.color3f(color.mV[VRED], color.mV[VGREEN], color.mV[VBLUE]);
 			gGL.vertex3f(-1.f, 0.f, 0.f);
 			gGL.vertex3f(1.f, 0.f, 0.f);
@@ -516,6 +517,17 @@ void LLHUDEffectLookAt::render()
 			gGL.vertex3f(0.f, 0.f, 1.f);
 		} gGL.end();
 		gGL.popMatrix();
+
+
+		if(!source_avatar->isSelf())
+		{
+			std::string av_name = source_avatar->getFullname();
+			const LLFontGL* big_fontp = LLFontGL::getFontSansSerif();
+			gGL.pushMatrix();
+			hud_render_utf8text(av_name,target+LLVector3(0.f,0.f,0.4f),*big_fontp,LLFontGL::NORMAL,LLFontGL::DROP_SHADOW_SOFT,-0.5*big_fontp->getWidthF32(av_name),3.f,color,FALSE);
+			gGL.popMatrix();
+		}
+
 	}
 }
 
-- 
cgit v1.2.3


From d7db567f27e6cc30aaffaf38d6ea219a7adf4678 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 9 Oct 2014 17:30:59 +0300
Subject: MAINT-4545 FIXED simplebot.dae rigged mesh no longer uploads

---
 indra/llprimitive/llmodel.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra')

diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index b19df0200d..aa8dd7697c 100755
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -180,18 +180,18 @@ LLModel::EModelStatus load_face_from_dom_triangles(std::vector<LLVolumeFace>& fa
 	domListOfUInts& idx = p->getValue();
 	
 	domListOfFloats  dummy ;
-	domListOfFloats& v = pos_source ? pos_source->getFloat_array()->getValue() : dummy ;
-	domListOfFloats& tc = tc_source ? tc_source->getFloat_array()->getValue() : dummy ;
-	domListOfFloats& n = norm_source ? norm_source->getFloat_array()->getValue() : dummy ;
+	domListOfFloats& v = (pos_source && pos_source->getFloat_array()) ? pos_source->getFloat_array()->getValue() : dummy ;
+	domListOfFloats& tc = (tc_source && tc_source->getFloat_array()) ? tc_source->getFloat_array()->getValue() : dummy ;
+	domListOfFloats& n = (norm_source && norm_source->getFloat_array()) ? norm_source->getFloat_array()->getValue() : dummy ;
 
 	LLVolumeFace::VertexMapData::PointMap point_map;
 		
 	U32 index_count  = idx.getCount();
-	U32 vertex_count = pos_source  ? v.getCount()  : 0;
-	U32 tc_count     = tc_source   ? tc.getCount() : 0;
-	U32 norm_count   = norm_source ? n.getCount()  : 0;
+	U32 vertex_count = (pos_source &&  pos_source->getFloat_array())	? v.getCount()	: 0;
+	U32 tc_count     = (tc_source && tc_source->getFloat_array()) 		? tc.getCount()	: 0;
+	U32 norm_count   = (norm_source && norm_source->getFloat_array()) 	? n.getCount(): 0;
 
-	if ((vertex_count == 0) || (tc_count == 0))
+	if ((vertex_count == 0))
 	{
 		LL_WARNS() << "Unable to process mesh with empty position array; invalid model." << LL_ENDL;
 		return LLModel::BAD_ELEMENT;
@@ -229,7 +229,7 @@ LLModel::EModelStatus load_face_from_dom_triangles(std::vector<LLVolumeFace>& fa
 		{
 			// guard against model data specifiying out of range indices or tcs
 			//
-			
+
 			if (((i + tc_offset) > index_count)
 			 || ((idx[i+tc_offset]*2+1) > tc_count))
 			{
-- 
cgit v1.2.3


From 825b4339db535c2672fd5b8779d142f093aec974 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Thu, 9 Oct 2014 22:43:09 +0300
Subject: Fixed a build issue in llpanellogin.cpp

---
 indra/newview/llpanellogin.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index ac0519a2fd..34f3bbf73e 100755
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -297,8 +297,6 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 	username_combo->setCommitCallback(boost::bind(&LLPanelLogin::onClickConnect, this));
 }
 
-		mUsernameLength = iter->first.length();
-		updateLoginButtons();
 void LLPanelLogin::addFavoritesToStartLocation()
 {
 	// Clear the combo.
-- 
cgit v1.2.3


From 4b33a395ba0d5d44fab5454ecccc054d2c83d57f Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Fri, 9 Jan 2015 16:36:55 -0800
Subject: FIX MAINT-2701 restore 10 translated strings that were lost during an
 earlier dev merge (see Jira screenshots for details)

---
 indra/newview/skins/default/xui/ru/menu_viewer.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index fad1ea51e0..26e3d37918 100755
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -165,6 +165,12 @@
 	</menu>
 	<menu label="Справка" name="Help">
 		<menu_item_call label="Инструкции..." name="How To"/>
+		<menu_item_call label="База знаний" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Форумы сообщества" name="Community Forums"/>
+		<menu_item_call label="Портал поддержки" name="Support portal"/>
+		<menu_item_call label="Новости [SECOND_LIFE]" name="Second Life News"/>
+		<menu_item_call label="Блоги [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Жалоба" name="Report Abuse"/>
 		<menu_item_call label="Сообщить об ошибке" name="Report Bug"/>
 		<menu_item_call label="О [APP_NAME]" name="About Second Life"/>
@@ -396,6 +402,12 @@
 				<menu_item_call label="Проверка женщины" name="Test Female"/>
 				<menu_item_check label="Разрешить выбор аватара" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="Скорость анимации" name="Animation Speed">
+				<menu_item_call label="Ускорить все анимации на 10%" name="All Animations 10 Faster"/>
+				<menu_item_call label="Замедлить все анимации на 10%" name="All Animations 10 Slower"/>
+				<menu_item_call label="Восстановить скорость анимаций" name="Reset All Animation Speed"/>
+				<menu_item_check label="Анимация медленных движений" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="Скинуть параметры" name="Force Params to Default"/>
 			<menu_item_check label="Данные об анимации" name="Animation Info"/>
 			<menu_item_check label="Показать взгляд" name="Show Look At"/>
-- 
cgit v1.2.3


From 88c26487c5d2924aad429e04f50b6b4088ac4e8c Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Mon, 12 Jan 2015 12:38:06 +0200
Subject: MAINT-2560 reverted

---
 indra/newview/llhudeffectlookat.cpp | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llhudeffectlookat.cpp b/indra/newview/llhudeffectlookat.cpp
index fadbf78ca5..73120a0242 100755
--- a/indra/newview/llhudeffectlookat.cpp
+++ b/indra/newview/llhudeffectlookat.cpp
@@ -39,8 +39,6 @@
 #include "llrendersphere.h"
 #include "llselectmgr.h"
 #include "llglheaders.h"
-#include "llfontgl.h"
-#include "llhudrender.h"
 #include "llxmltree.h"
 
 
@@ -497,15 +495,14 @@ void LLHUDEffectLookAt::render()
 	{
 		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
-		LLVOAvatar* source_avatar = ((LLVOAvatar*)(LLViewerObject*)mSourceObject);
-		LLVector3 target = mTargetPos + source_avatar->mHeadp->getWorldPosition();
+		LLVector3 target = mTargetPos + ((LLVOAvatar*)(LLViewerObject*)mSourceObject)->mHeadp->getWorldPosition();
 		gGL.matrixMode(LLRender::MM_MODELVIEW);
 		gGL.pushMatrix();
 		gGL.translatef(target.mV[VX], target.mV[VY], target.mV[VZ]);
 		gGL.scalef(0.3f, 0.3f, 0.3f);
-		LLColor3 color = (*mAttentions)[mTargetType].mColor;
 		gGL.begin(LLRender::LINES);
 		{
+			LLColor3 color = (*mAttentions)[mTargetType].mColor;
 			gGL.color3f(color.mV[VRED], color.mV[VGREEN], color.mV[VBLUE]);
 			gGL.vertex3f(-1.f, 0.f, 0.f);
 			gGL.vertex3f(1.f, 0.f, 0.f);
@@ -517,17 +514,6 @@ void LLHUDEffectLookAt::render()
 			gGL.vertex3f(0.f, 0.f, 1.f);
 		} gGL.end();
 		gGL.popMatrix();
-
-
-		if(!source_avatar->isSelf())
-		{
-			std::string av_name = source_avatar->getFullname();
-			const LLFontGL* big_fontp = LLFontGL::getFontSansSerif();
-			gGL.pushMatrix();
-			hud_render_utf8text(av_name,target+LLVector3(0.f,0.f,0.4f),*big_fontp,LLFontGL::NORMAL,LLFontGL::DROP_SHADOW_SOFT,-0.5*big_fontp->getWidthF32(av_name),3.f,color,FALSE);
-			gGL.popMatrix();
-		}
-
 	}
 }
 
-- 
cgit v1.2.3


From 96e5fc9f9b185f846b978984c673f0114409513d Mon Sep 17 00:00:00 2001
From: ruslantproductengine <ruslantproductengine@lindenlab.com>
Date: Sat, 14 Feb 2015 00:08:39 +0200
Subject: MAINT-4329 Backed out changeset: fd3a4d5c2cf5

---
 indra/llimage/llimage.cpp | 66 ++++++++++++++++++++++++++++++++++++-----------
 indra/llimage/llimage.h   | 10 +++----
 indra/llmath/llmath.h     | 30 ---------------------
 3 files changed, 56 insertions(+), 50 deletions(-)

(limited to 'indra')

diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index eaac6806ab..d336eeaabc 100755
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -524,7 +524,7 @@ inline U8 LLImageRaw::fastFractionalMult( U8 a, U8 b )
 }
 
 
-void LLImageRaw::composite( const LLImageRaw* src )
+void LLImageRaw::composite( LLImageRaw* src )
 {
 	LLImageRaw* dst = this;  // Just for clarity.
 
@@ -560,7 +560,7 @@ void LLImageRaw::composite( const LLImageRaw* src )
 }
 
 // Src and dst can be any size.  Src has 4 components.  Dst has 3 components.
-void LLImageRaw::compositeScaled4onto3(const LLImageRaw* src)
+void LLImageRaw::compositeScaled4onto3(LLImageRaw* src)
 {
 	LL_INFOS() << "compositeScaled4onto3" << LL_ENDL;
 
@@ -568,12 +568,26 @@ void LLImageRaw::compositeScaled4onto3(const LLImageRaw* src)
 
 	llassert( (4 == src->getComponents()) && (3 == dst->getComponents()) );
 
-	ll_nn2d_interpolation(src->getData(), src->getWidth(), src->getHeight(), src->getComponents(), dst->getData(), dst->getWidth(), dst->getHeight(), dst->getComponents());
+	S32 temp_data_size = src->getWidth() * dst->getHeight() * src->getComponents();
+	llassert_always(temp_data_size > 0);
+	std::vector<U8> temp_buffer(temp_data_size);
+
+	// Vertical: scale but no composite
+	for( S32 col = 0; col < src->getWidth(); col++ )
+	{
+		copyLineScaled( src->getData() + (src->getComponents() * col), &temp_buffer[0] + (src->getComponents() * col), src->getHeight(), dst->getHeight(), src->getWidth(), src->getWidth() );
+	}
+
+	// Horizontal: scale and composite
+	for( S32 row = 0; row < dst->getHeight(); row++ )
+	{
+		compositeRowScaled4onto3( &temp_buffer[0] + (src->getComponents() * src->getWidth() * row), dst->getData() + (dst->getComponents() * dst->getWidth() * row), src->getWidth(), dst->getWidth() );
+	}
 }
 
 
 // Src and dst are same size.  Src has 4 components.  Dst has 3 components.
-void LLImageRaw::compositeUnscaled4onto3( const LLImageRaw* src )
+void LLImageRaw::compositeUnscaled4onto3( LLImageRaw* src )
 {
 	/*
 	//test fastFractionalMult()
@@ -596,7 +610,7 @@ void LLImageRaw::compositeUnscaled4onto3( const LLImageRaw* src )
 	llassert( (src->getWidth() == dst->getWidth()) && (src->getHeight() == dst->getHeight()) );
 
 
-	const U8* src_data = src->getData();
+	U8* src_data = src->getData();
 	U8* dst_data = dst->getData();
 	S32 pixels = getWidth() * getHeight();
 	while( pixels-- )
@@ -737,7 +751,7 @@ void LLImageRaw::copy(LLImageRaw* src)
 }
 
 // Src and dst are same size.  Src and dst have same number of components.
-void LLImageRaw::copyUnscaled(const LLImageRaw* src)
+void LLImageRaw::copyUnscaled(LLImageRaw* src)
 {
 	LLImageRaw* dst = this;  // Just for clarity.
 
@@ -819,7 +833,7 @@ void LLImageRaw::copyUnscaled3onto4( LLImageRaw* src )
 
 
 // Src and dst can be any size.  Src and dst have same number of components.
-void LLImageRaw::copyScaled( const LLImageRaw* src )
+void LLImageRaw::copyScaled( LLImageRaw* src )
 {
 	LLImageRaw* dst = this;  // Just for clarity.
 
@@ -832,7 +846,21 @@ void LLImageRaw::copyScaled( const LLImageRaw* src )
 		return;
 	}
 
-	ll_nn2d_interpolation(src->getData(), src->getWidth(), src->getHeight(), src->getComponents(), dst->getData(), dst->getWidth(), dst->getHeight(), dst->getComponents());
+	S32 temp_data_size = src->getWidth() * dst->getHeight() * getComponents();
+	llassert_always(temp_data_size > 0);
+	std::vector<U8> temp_buffer(temp_data_size);
+
+	// Vertical
+	for( S32 col = 0; col < src->getWidth(); col++ )
+	{
+		copyLineScaled( src->getData() + (getComponents() * col), &temp_buffer[0] + (getComponents() * col), src->getHeight(), dst->getHeight(), src->getWidth(), src->getWidth() );
+	}
+
+	// Horizontal
+	for( S32 row = 0; row < dst->getHeight(); row++ )
+	{
+		copyLineScaled( &temp_buffer[0] + (getComponents() * src->getWidth() * row), dst->getData() + (getComponents() * dst->getWidth() * row), src->getWidth(), dst->getWidth(), 1, 1 );
+	}
 }
 
 
@@ -852,17 +880,25 @@ BOOL LLImageRaw::scale( S32 new_width, S32 new_height, BOOL scale_image_data )
 
 	if (scale_image_data)
 	{
-		S32 new_data_size = new_width * new_height * getComponents();
-		llassert_always(new_data_size > 0);
+		S32 temp_data_size = old_width * new_height * getComponents();
+		llassert_always(temp_data_size > 0);
+		std::vector<U8> temp_buffer(temp_data_size);
 
-		U8 *new_data = (U8*)ALLOCATE_MEM(LLImageBase::getPrivatePool(), new_data_size); 
-		if(NULL == new_data) 
+		// Vertical
+		for( S32 col = 0; col < old_width; col++ )
 		{
-			return FALSE; 
+			copyLineScaled( getData() + (getComponents() * col), &temp_buffer[0] + (getComponents() * col), old_height, new_height, old_width, old_width );
 		}
 
-		ll_nn2d_interpolation(getData(), old_width, old_height, getComponents(), new_data, new_width, new_height, getComponents());
-		setDataAndSize(new_data, new_width, new_height, getComponents());
+		deleteData();
+
+		U8* new_buffer = allocateDataSize(new_width, new_height, getComponents());
+
+		// Horizontal
+		for( S32 row = 0; row < new_height; row++ )
+		{
+			copyLineScaled( &temp_buffer[0] + (getComponents() * old_width * row), new_buffer + (getComponents() * new_width * row), old_width, new_width, 1, 1 );
+		}
 	}
 	else
 	{
diff --git a/indra/llimage/llimage.h b/indra/llimage/llimage.h
index eeb8e6de53..cd3f76f1fd 100755
--- a/indra/llimage/llimage.h
+++ b/indra/llimage/llimage.h
@@ -229,7 +229,7 @@ public:
 	void copy( LLImageRaw* src );
 
 	// Src and dst are same size.  Src and dst have same number of components.
-	void copyUnscaled( const LLImageRaw* src );
+	void copyUnscaled( LLImageRaw* src );
 	
 	// Src and dst are same size.  Src has 4 components.  Dst has 3 components.
 	void copyUnscaled4onto3( LLImageRaw* src );
@@ -243,7 +243,7 @@ public:
 	void copyUnscaledAlphaMask( LLImageRaw* src, const LLColor4U& fill);
 
 	// Src and dst can be any size.  Src and dst have same number of components.
-	void copyScaled( const LLImageRaw* src );
+	void copyScaled( LLImageRaw* src );
 
 	// Src and dst can be any size.  Src has 3 components.  Dst has 4 components.
 	void copyScaled3onto4( LLImageRaw* src );
@@ -255,13 +255,13 @@ public:
 	// Composite operations
 
 	// Src and dst can be any size.  Src and dst can each have 3 or 4 components.
-	void composite( const LLImageRaw* src );
+	void composite( LLImageRaw* src );
 
 	// Src and dst can be any size.  Src has 4 components.  Dst has 3 components.
-	void compositeScaled4onto3( const LLImageRaw* src );
+	void compositeScaled4onto3( LLImageRaw* src );
 
 	// Src and dst are same size.  Src has 4 components.  Dst has 3 components.
-	void compositeUnscaled4onto3( const LLImageRaw* src );
+	void compositeUnscaled4onto3( LLImageRaw* src );
 
 protected:
 	// Create an image from a local file (generally used in tools)
diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h
index b4ac1dec73..a8b27ad189 100755
--- a/indra/llmath/llmath.h
+++ b/indra/llmath/llmath.h
@@ -32,7 +32,6 @@
 #include <vector>
 #include <limits>
 #include "lldefs.h"
-#include "llerror.h"
 //#include "llstl.h" // *TODO: Remove when LLString is gone
 //#include "llstring.h" // *TODO: Remove when LLString is gone
 // lltut.h uses is_approx_equal_fraction(). This was moved to its own header
@@ -557,35 +556,6 @@ inline void ll_remove_outliers(std::vector<VEC_TYPE>& data, F32 k)
 	}
 }
 
-inline void	ll_nn2d_interpolation(const U8 *const src, U32 srcW, U32 srcH, U8 srcCh, U8 *const dst, U32 dstW, U32 dstH, U8 dstCh)
-{
-	llassert(srcCh>=dstCh);
-
-	S32 tmp_x = 0, tmp_y = 0, tmp_x1 = 0, tmp_x2 = 0;
-
-	const S32 x_r = ((srcW<<16)/dstW)+1;
-	const S32 y_r = ((srcH<<16)/dstH)+1;
-	const S32 srcW_ch = srcW*srcCh;
-	const S32 dstW_ch = dstW*dstCh;
-
-	for(U32 y = 0; y < dstH; ++y)
-	{
-		tmp_y = ((y*y_r)>>16)*srcW_ch;
-		tmp_x1 = y*dstW_ch;
-
-		for(U32 x = 0; x < dstW; x++)
-		{
-			tmp_x = (((x*x_r)>>16)*srcCh)+tmp_y;
-			tmp_x2 = tmp_x1+x*dstCh;
-
-			for(U8 c = 0; c < dstCh; ++c)
-			{
-				dst[tmp_x2+c] = src[tmp_x+c];
-			}
-		}
-	}
-}
-
 // Include simd math header
 #include "llsimdmath.h"
 
-- 
cgit v1.2.3


From 9b45bc992edf8d049d8a1abe2e778870a493295a Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 24 Feb 2015 15:43:05 -0500
Subject: increment viewer version to 3.7.26

---
 indra/newview/VIEWER_VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index c282746153..e5403775b2 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-3.7.25
+3.7.26
-- 
cgit v1.2.3