summaryrefslogtreecommitdiff
path: root/indra/newview/llpathfindingmanager.cpp
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-02-23 18:41:23 -0800
committerTodd Stinson <stinson@lindenlab.com>2012-02-23 18:41:23 -0800
commit640b08c58aa76d88bd603576bcc03117ac983e90 (patch)
tree8701595d25c673bb6613f2a04febe5e42e6b08e7 /indra/newview/llpathfindingmanager.cpp
parent05a49dd4252930fbfbb61a7e88ef5ef253cceca6 (diff)
PATH-292: Fixing an issue where clicking Apply Edits without any changes resulted in an usable floater state.
Diffstat (limited to 'indra/newview/llpathfindingmanager.cpp')
-rw-r--r--indra/newview/llpathfindingmanager.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp
index aafa2eaa10..7cfa07718b 100644
--- a/indra/newview/llpathfindingmanager.cpp
+++ b/indra/newview/llpathfindingmanager.cpp
@@ -165,7 +165,7 @@ LLPathfindingManager::ELinksetsRequestStatus LLPathfindingManager::requestGetLin
std::string linksetsURL = getLinksetsURLForCurrentRegion();
if (linksetsURL.empty())
- {;
+ {
status = kLinksetsRequestNotEnabled;
}
else
@@ -191,8 +191,15 @@ LLPathfindingManager::ELinksetsRequestStatus LLPathfindingManager::requestSetLin
{
LLHTTPClient::ResponderPtr responder = new LinksetsResponder(linksetsURL, pLinksetsCallback);
LLSD postData = pLinksetList->encodeAlteredFields(pLinksetUse, pA, pB, pC, pD);
- LLHTTPClient::put(linksetsURL, postData, responder);
- status = kLinksetsRequestStarted;
+ if (postData.isUndefined())
+ {
+ status = kLinksetsRequestCompleted;
+ }
+ else
+ {
+ LLHTTPClient::put(linksetsURL, postData, responder);
+ status = kLinksetsRequestStarted;
+ }
}
return status;