summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-04-21 17:10:45 -0700
committerMerov Linden <merov@lindenlab.com>2014-04-21 17:10:45 -0700
commit40a51eb94dae1bc8ba287706b514b3e54b1dade8 (patch)
tree83c8ddeccb70e61f494edc8618c60658e316f4db /indra/newview
parentcda6ac9e9b0dc9c75746440d98a98d3556ec9b4e (diff)
DD-72 : Fix display of stock number on listing with no associated version folder
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llinventoryfunctions.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 237a1baac0..10a5ac4bc7 100755
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -845,6 +845,11 @@ S32 compute_stock_count(LLUUID cat_uuid)
// If there is a version folder, the stock value for the listing is the version folder stock
return compute_stock_count(version_folder_uuid);
}
+ else
+ {
+ // If there's no version folder associated, the notion of stock count has no meaning
+ return -1;
+ }
}
else if (depth == 2)
{