From 27bcc5f06e74257bd21ba207777f8fff45224e18 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 21 Jun 2016 13:13:10 +0300
Subject: MAINT-6497 FIXED land buy disqualification missing warning icon

---
 indra/newview/llfloatersellland.cpp               | 3 +--
 indra/newview/llviewchildren.cpp                  | 5 +++--
 indra/newview/skins/default/textures/textures.xml | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloatersellland.cpp b/indra/newview/llfloatersellland.cpp
index 0cb37dabe7..b139e5daf5 100644
--- a/indra/newview/llfloatersellland.cpp
+++ b/indra/newview/llfloatersellland.cpp
@@ -257,7 +257,6 @@ void LLFloaterSellLandUI::setBadge(const char* id, Badge badge)
 	static std::string badgeOK("badge_ok.j2c");
 	static std::string badgeNote("badge_note.j2c");
 	static std::string badgeWarn("badge_warn.j2c");
-	static std::string badgeError("badge_error.j2c");
 	
 	std::string badgeName;
 	switch (badge)
@@ -266,7 +265,7 @@ void LLFloaterSellLandUI::setBadge(const char* id, Badge badge)
 		case BADGE_OK:		badgeName = badgeOK;	break;
 		case BADGE_NOTE:	badgeName = badgeNote;	break;
 		case BADGE_WARN:	badgeName = badgeWarn;	break;
-		case BADGE_ERROR:	badgeName = badgeError;	break;
+		case BADGE_ERROR:	badgeName = badgeWarn;	break;
 	}
 	
 	getChild<LLUICtrl>(id)->setValue(badgeName);
diff --git a/indra/newview/llviewchildren.cpp b/indra/newview/llviewchildren.cpp
index 5c5bbdc8f5..32b2f7e9f5 100644
--- a/indra/newview/llviewchildren.cpp
+++ b/indra/newview/llviewchildren.cpp
@@ -79,8 +79,9 @@ void LLViewChildren::setBadge(const std::string& id, Badge badge, bool visible)
 			default:
 			case BADGE_OK:		child->setValue(std::string("badge_ok.j2c"));	break;
 			case BADGE_NOTE:	child->setValue(std::string("badge_note.j2c"));	break;
-			case BADGE_WARN:	child->setValue(std::string("badge_warn.j2c"));	break;
-			case BADGE_ERROR:	child->setValue(std::string("badge_error.j2c"));	break;
+			case BADGE_WARN:
+			case BADGE_ERROR:
+				child->setValue(std::string("badge_warn.j2c"));	break;
 		}
 	}
 }
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 72037a84b3..85f4ae587a 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -774,6 +774,9 @@ with the same filename but different name
   <texture name="default_land_picture.j2c" />
   <texture name="default_profile_picture.j2c" />
   <texture name="locked_image.j2c" />
+  <texture name="badge_note.j2c" />
+  <texture name="badge_warn.j2c" />
+  <texture name="badge_ok.j2c" />
   <texture name="materials_ui_x_24.png" />
 
   <texture name="Progress_1" file_name="icons/Progress_1.png" preload="true" />
-- 
cgit v1.2.3