diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-06-05 18:32:19 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-05 18:32:19 -0700 |
| commit | a48ee0e86ade940014cb5f58b8ab6f4517789455 (patch) | |
| tree | 924cc383c2cfe359349494bab74b125d5ceab614 | |
| parent | 9762c5c98c90f8bb42f1c39bb4879710e0f0b457 (diff) | |
BUGFIX: Correcting an assert behavior where the LLSD returned from calls to convertObjectsIntoScrollListData() should be required to be an array type.
| -rw-r--r-- | indra/newview/llfloaterpathfindingcharacters.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llfloaterpathfindinglinksets.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpathfindingcharacters.cpp b/indra/newview/llfloaterpathfindingcharacters.cpp index d159cc04f2..098881544f 100644 --- a/indra/newview/llfloaterpathfindingcharacters.cpp +++ b/indra/newview/llfloaterpathfindingcharacters.cpp @@ -139,7 +139,7 @@ LLSD LLFloaterPathfindingCharacters::convertObjectsIntoScrollListData(const LLPa llassert(pObjectListPtr != NULL); llassert(!pObjectListPtr->isEmpty()); - LLSD scrollListData; + LLSD scrollListData = LLSD::emptyArray(); for (LLPathfindingObjectList::const_iterator objectIter = pObjectListPtr->begin(); objectIter != pObjectListPtr->end(); ++objectIter) { diff --git a/indra/newview/llfloaterpathfindinglinksets.cpp b/indra/newview/llfloaterpathfindinglinksets.cpp index bb1bcd0cb8..1d7f165ad9 100644 --- a/indra/newview/llfloaterpathfindinglinksets.cpp +++ b/indra/newview/llfloaterpathfindinglinksets.cpp @@ -225,7 +225,7 @@ LLSD LLFloaterPathfindingLinksets::convertObjectsIntoScrollListData(const LLPath bool isFilteringDescription = !descriptionFilter.empty(); bool isFilteringLinksetUse = (linksetUseFilter != LLPathfindingLinkset::kUnknown); - LLSD scrollListData; + LLSD scrollListData = LLSD::emptyArray(); const LLVector3& avatarPosition = gAgent.getPositionAgent(); if (isFilteringName || isFilteringDescription || isFilteringLinksetUse) |