From 9762c5c98c90f8bb42f1c39bb4879710e0f0b457 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 5 Jun 2012 18:19:08 -0700
Subject: PATH-682: Correcting behavior for the case where setting the linksets
 and the response returned is an error, and this causes the viewer to crash. 
 This commit should remove the viewer crash.

---
 indra/newview/llfloaterpathfindingobjects.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterpathfindingobjects.cpp b/indra/newview/llfloaterpathfindingobjects.cpp
index 56f45a886f..6f183c78b1 100644
--- a/indra/newview/llfloaterpathfindingobjects.cpp
+++ b/indra/newview/llfloaterpathfindingobjects.cpp
@@ -304,10 +304,12 @@ void LLFloaterPathfindingObjects::handleUpdateObjectList(LLPathfindingManager::r
 			setMessagingState(kMessagingNotEnabled);
 			break;
 		case LLPathfindingManager::kRequestError :
-			setMessagingState(kMessagingGetError);
+			clearAllObjects();
+			setMessagingState(kMessagingSetError);
 			break;
 		default :
-			setMessagingState(kMessagingGetError);
+			clearAllObjects();
+			setMessagingState(kMessagingSetError);
 			llassert(0);
 			break;
 		}
@@ -401,7 +403,7 @@ BOOL LLFloaterPathfindingObjects::isShowBeacons() const
 void LLFloaterPathfindingObjects::clearAllObjects()
 {
 	selectNoneObjects();
-	mObjectsScrollList->clear();
+	mObjectsScrollList->deleteAllItems();
 	mObjectList.reset();
 }
 
-- 
cgit v1.2.3