p#494 Add search by agent ID to resident chooser

4 files changed, 118 insertions, 37 deletions

diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp
index 64f660d0ce..4980e0a1da 100644
--- a/indra/llmessage/llcachename.cpp
+++ b/indra/llmessage/llcachename.cpp
@@ -780,6 +780,7 @@ void LLCacheName::Impl::processPendingAsks()
 void LLCacheName::Impl::processPendingReplies()
 {
     // First call all the callbacks, because they might send messages.
+    // Todo: needs cleanup logic, otherwise invalid ids might stay here indefinitely
     for(ReplyQueue::iterator it = mReplyQueue.begin(); it != mReplyQueue.end(); ++it)
     {
         PendingReply* reply = *it;
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp
index 08a54b7369..fd9bbf00ae 100644
--- a/indra/newview/llfloateravatarpicker.cpp
+++ b/indra/newview/llfloateravatarpicker.cpp
@@ -34,6 +34,7 @@
 #include "llfloaterreg.h"
 #include "llimview.h"           // for gIMMgr
 #include "lltooldraganddrop.h"  // for LLToolDragAndDrop
+#include "lltrans.h"
 #include "llviewercontrol.h"
 #include "llviewerregion.h"     // getCapability()
 #include "llworld.h"
@@ -405,15 +406,50 @@ bool LLFloaterAvatarPicker::visibleItemsSelected() const
 }
 
 /*static*/
-void LLFloaterAvatarPicker::findCoro(std::string url, LLUUID queryID, std::string name)
+void LLFloaterAvatarPicker::findByIdCoro(std::string url, LLUUID query_id, LLUUID agent_id, std::string floater_key)
 {
     LLCore::HttpRequest::policy_t httpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID);
     LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t
-        httpAdapter(new LLCoreHttpUtil::HttpCoroutineAdapter("genericPostCoro", httpPolicy));
+        httpAdapter(new LLCoreHttpUtil::HttpCoroutineAdapter("findByIdCoro", httpPolicy));
     LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest);
     LLCore::HttpOptions::ptr_t httpOpts(new LLCore::HttpOptions);
 
-    LL_INFOS("HttpCoroutineAdapter", "genericPostCoro") << "Generic POST for " << url << LL_ENDL;
+    httpOpts->setTimeout(AVATAR_PICKER_SEARCH_TIMEOUT);
+
+    LLSD result = httpAdapter->getAndSuspend(httpRequest, url, httpOpts);
+
+    LL_DEBUGS("Agent") << result << LL_ENDL;
+
+    LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
+    LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
+
+    if (status || (status == LLCore::HttpStatus(HTTP_BAD_REQUEST)))
+    {
+        result.erase(LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS);
+    }
+    else
+    {
+        result["failure_reason"] = status.toString();
+    }
+
+    LLFloaterAvatarPicker* floater =
+        LLFloaterReg::findTypedInstance<LLFloaterAvatarPicker>("avatar_picker", floater_key);
+    if (floater)
+    {
+        floater->processResponse(query_id, result);
+    }
+}
+
+/*static*/
+void LLFloaterAvatarPicker::findByNameCoro(std::string url, LLUUID queryID, std::string name)
+{
+    LLCore::HttpRequest::policy_t httpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID);
+    LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t
+        httpAdapter(new LLCoreHttpUtil::HttpCoroutineAdapter("findByNameCoro", httpPolicy));
+    LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest);
+    LLCore::HttpOptions::ptr_t httpOpts(new LLCore::HttpOptions);
+
+    LL_INFOS("HttpCoroutineAdapter", "genericPostCoro", "Agent") << "Generic POST for " << url << LL_ENDL;
 
     httpOpts->setTimeout(AVATAR_PICKER_SEARCH_TIMEOUT);
 
@@ -447,6 +483,7 @@ void LLFloaterAvatarPicker::find()
 
     std::string text = getChild<LLUICtrl>("Edit")->getValue().asString();
 
+    LLUUID agent_id;
     size_t separator_index = text.find_first_of(" ._");
     if (separator_index != text.npos)
     {
@@ -458,51 +495,92 @@ void LLFloaterAvatarPicker::find()
             text = first;
         }
     }
+    else if (!text.empty())
+    {
+        agent_id.set(text);
+    }
 
     mQueryID.generate();
+    mNumResultsReturned = 0;
 
-    std::string url;
-    url.reserve(128); // avoid a memory allocation or two
+    getChild<LLScrollListCtrl>("SearchResults")->deleteAllItems();
+    getChild<LLScrollListCtrl>("SearchResults")->setCommentText(getString("searching"));
+    getChildView("ok_btn")->setEnabled(false);
 
-    LLViewerRegion* region = gAgent.getRegion();
-    if(region)
+    if (agent_id.notNull())
     {
-        url = region->getCapability("AvatarPickerSearch");
-        // Prefer use of capabilities to search on both SLID and display name
-        if (!url.empty())
+        // Search by uuid
+        // While cache could have been nicer, it neither has a failure callback, nor
+        // can cleanup in case of an invalid uuid. So we go directly to the capability.
+        LLViewerRegion* region = gAgent.getRegion();
+        if (region)
         {
-            // capability urls don't end in '/', but we need one to parse
-            // query parameters correctly
-            if (url.size() > 0 && url[url.size()-1] != '/')
+            std::string url;
+            url.reserve(128);
+            url = region->getCapability("GetDisplayNames");
+            if (!url.empty())
             {
-                url += "/";
-            }
-            url += "?page_size=100&names=";
-            std::replace(text.begin(), text.end(), '.', ' ');
-            url += LLURI::escape(text);
-            LL_INFOS() << "avatar picker " << url << LL_ENDL;
+                // capability urls don't end in '/', but we need one to parse
+                // query parameters correctly
+                if (url[url.size() - 1] != '/')
+                {
+                    url += "/";
+                }
+                url += "?ids=";
+                url += agent_id.asString();
+                LL_DEBUGS("Agent") << "avatar picker " << url << LL_ENDL;
 
-            LLCoros::instance().launch("LLFloaterAvatarPicker::findCoro",
-                boost::bind(&LLFloaterAvatarPicker::findCoro, url, mQueryID, getKey().asString()));
+                LLCoros::instance().launch("LLFloaterAvatarPicker::findCoro",
+                    boost::bind(&LLFloaterAvatarPicker::findByIdCoro, url, mQueryID, agent_id, getKey().asString()));
+            }
+            else
+            {
+                LLSD content;
+                content["failure_reason"] = LLTrans::getString("ServerUnavailable");
+                processResponse(mQueryID, content);
+            }
         }
-        else
+    }
+    else
+    {
+        std::string url;
+        url.reserve(128); // avoid a memory allocation or two
+
+        LLViewerRegion* region = gAgent.getRegion();
+        if (region)
         {
-            LLMessageSystem* msg = gMessageSystem;
-            msg->newMessage("AvatarPickerRequest");
-            msg->nextBlock("AgentData");
-            msg->addUUID("AgentID", gAgent.getID());
-            msg->addUUID("SessionID", gAgent.getSessionID());
-            msg->addUUID("QueryID", mQueryID);  // not used right now
-            msg->nextBlock("Data");
-            msg->addString("Name", text);
-            gAgent.sendReliableMessage();
+            url = region->getCapability("AvatarPickerSearch");
+            // Prefer use of capabilities to search on both SLID and display name
+            if (!url.empty())
+            {
+                // capability urls don't end in '/', but we need one to parse
+                // query parameters correctly
+                if (url.size() > 0 && url[url.size() - 1] != '/')
+                {
+                    url += "/";
+                }
+                url += "?page_size=100&names=";
+                std::replace(text.begin(), text.end(), '.', ' ');
+                url += LLURI::escape(text);
+                LL_DEBUGS("Agent") << "avatar picker " << url << LL_ENDL;
+
+                LLCoros::instance().launch("LLFloaterAvatarPicker::findCoro",
+                    boost::bind(&LLFloaterAvatarPicker::findByNameCoro, url, mQueryID, getKey().asString()));
+            }
+            else
+            {
+                LLMessageSystem* msg = gMessageSystem;
+                msg->newMessage("AvatarPickerRequest");
+                msg->nextBlock("AgentData");
+                msg->addUUID("AgentID", gAgent.getID());
+                msg->addUUID("SessionID", gAgent.getSessionID());
+                msg->addUUID("QueryID", mQueryID);  // not used right now
+                msg->nextBlock("Data");
+                msg->addString("Name", text);
+                gAgent.sendReliableMessage();
+            }
         }
     }
-    getChild<LLScrollListCtrl>("SearchResults")->deleteAllItems();
-    getChild<LLScrollListCtrl>("SearchResults")->setCommentText(getString("searching"));
-
-    getChildView("ok_btn")->setEnabled(false);
-    mNumResultsReturned = 0;
 }
 
 void LLFloaterAvatarPicker::setAllowMultiple(bool allow_multiple)
diff --git a/indra/newview/llfloateravatarpicker.h b/indra/newview/llfloateravatarpicker.h
index 330f1a1226..817427aae6 100644
--- a/indra/newview/llfloateravatarpicker.h
+++ b/indra/newview/llfloateravatarpicker.h
@@ -86,7 +86,8 @@ private:
     void populateFriend();
     bool visibleItemsSelected() const; // Returns true if any items in the current tab are selected.
 
-    static void findCoro(std::string url, LLUUID mQueryID, std::string mName);
+    static void findByIdCoro(std::string url, LLUUID query_id, LLUUID agent_id, std::string floater_key);
+    static void findByNameCoro(std::string url, LLUUID mQueryID, std::string mName);
     void find();
     void setAllowMultiple(bool allow_multiple);
     LLScrollListCtrl* getActiveList();
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 99c7d7b7d4..8e0eea97d1 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -327,6 +327,7 @@ are allowed.
 	<!-- searching - generic -->
 	<string name="Searching">Searching...</string>
 	<string name="NoneFound">None found.</string>
+    <string name="ServerUnavailable">Service not available.</string>
 
 	<!-- Indicates that an avatar name or other similar datum is being retrieved. General usage. -->
 	<string name="RetrievingData">Retrieving...</string>