diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-06-05 18:19:08 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-05 18:19:08 -0700 |
| commit | 9762c5c98c90f8bb42f1c39bb4879710e0f0b457 (patch) | |
| tree | 020521efa62d46b5751f583fc763d32d569cc4f6 /indra | |
| parent | 546c2583af7e34784a9e970c70fcfe47ba691e4d (diff) | |
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.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterpathfindingobjects.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
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(); } |