summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-12-17 13:24:57 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-12-17 13:24:57 -0500
commitb86a3e39cf8d0d17d5cd30743a871e3078331077 (patch)
treef74a944e8307fa546941a3e6a4e778089484e99b /indra
parent1701da73005a77efbb2f001bd2b6d74fdae3f1fd (diff)
SH-3604 FIX - resolved an issue with simulated failures/retry logic
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llappearancemgr.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index f957aadec5..7fd7b33be4 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -217,12 +217,12 @@ public:
if (ll_frand()<gSavedSettings.getF32("InventoryDebugSimulateOpFailureRate"))
{
// simulate server failure by not sending the request.
- return;
+ // do nothing
+ LL_DEBUGS("Avatar") << "simulating failure by not sending request for item " << item_id << " linked_id " << linked_id << llendl;
}
-
- if (!requestOperation(linked_id))
+ else if (!requestOperation(linked_id))
{
- LL_DEBUGS("Avatar") << "item_id " << item_id << " linked_id " << linked_id << " not requested" << llendl;
+ LL_DEBUGS("Avatar") << "item_id " << item_id << " linked_id " << linked_id << " requestOperation false, skipping" << llendl;
return;
}
@@ -237,7 +237,6 @@ public:
{
mRetryCounts[linked_id]++;
}
-
}
virtual bool requestOperation(const LLUUID& item_id) = 0;