diff options
Diffstat (limited to 'linden/indra/newview/llinventorymodel.cpp')
-rw-r--r-- | linden/indra/newview/llinventorymodel.cpp | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp index 5a91cac..13a45a8 100644 --- a/linden/indra/newview/llinventorymodel.cpp +++ b/linden/indra/newview/llinventorymodel.cpp | |||
@@ -1153,7 +1153,13 @@ void LLInventoryModel::fetchDescendentsResponder::onClickRetry(S32 option, void* | |||
1153 | { | 1153 | { |
1154 | if (option == 0) | 1154 | if (option == 0) |
1155 | { | 1155 | { |
1156 | std::string url = gAgent.getRegion()->getCapability("FetchInventoryDescendents"); | 1156 | std::string url; |
1157 | |||
1158 | LLViewerRegion * agent_region = gAgent.getRegion(); | ||
1159 | if (agent_region) | ||
1160 | { | ||
1161 | url = agent_region->getCapability("FetchInventoryDescendents"); | ||
1162 | } | ||
1157 | 1163 | ||
1158 | if (!url.empty()) //Capability found. Build up LLSD and use it. | 1164 | if (!url.empty()) //Capability found. Build up LLSD and use it. |
1159 | { | 1165 | { |
@@ -1346,7 +1352,14 @@ void LLInventoryModel::backgroundFetch(void*) | |||
1346 | if (sBackgroundFetchActive) | 1352 | if (sBackgroundFetchActive) |
1347 | { | 1353 | { |
1348 | //If we'll be using the capability, we'll be sending batches and the background thing isn't as important. | 1354 | //If we'll be using the capability, we'll be sending batches and the background thing isn't as important. |
1349 | std::string url = gAgent.getRegion()->getCapability("FetchInventoryDescendents"); | 1355 | std::string url; |
1356 | |||
1357 | LLViewerRegion * agent_region = gAgent.getRegion(); | ||
1358 | if (agent_region) | ||
1359 | { | ||
1360 | url = agent_region->getCapability("FetchInventoryDescendents"); | ||
1361 | } | ||
1362 | |||
1350 | if (!url.empty()) | 1363 | if (!url.empty()) |
1351 | { | 1364 | { |
1352 | bulkFetch(url); | 1365 | bulkFetch(url); |