livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add search by UUID for legacy people search

meow-7.2.2
Ansariel 2021-04-13 10:55:47 +02:00
parent 0dd7dd6ba0
commit 97842c3a82
2 changed files with 111 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
indra/newview/fsfloatersearch.cpp
View File

@ -729,11 +729,16 @@ FSPanelSearchPeople::FSPanelSearchPeople() : FSSearchPanelBase()
, mStartSearch(0)
, mResultsReceived(0)
, mResultsContent()
, mAvatarNameCallbackConnection()
{
}
FSPanelSearchPeople::~FSPanelSearchPeople()
{
if (mAvatarNameCallbackConnection.connected())
{
mAvatarNameCallbackConnection.disconnect();
}
}
BOOL FSPanelSearchPeople::postBuild()
@ -776,6 +781,24 @@ void FSPanelSearchPeople::find()
return;
}
if (LLUUID::validate(text))
{
LLUUID id(text);
mSearchResults->deleteAllItems();
mSearchResults->setCommentText(LLTrans::getString("searching"));
mResultsReceived = 0;
mNumResultsReturned = 0;
if (mAvatarNameCallbackConnection.connected())
{
mAvatarNameCallbackConnection.disconnect();
}
mAvatarNameCallbackConnection = LLAvatarNameCache::get(id, boost::bind(&FSPanelSearchPeople::onAvatarNameCallback, this, _1, _2));
return;
}
LLStringUtil::replaceChar(text, '.', ' ');
mResultsReceived = 0;
@ -784,7 +807,7 @@ void FSPanelSearchPeople::find()
mQueryID.setNull();
}
mQueryID.generate();
if (mStartSearch < 0)
{
mStartSearch = 0;
@ -996,6 +1019,50 @@ void FSPanelSearchPeople::processSearchReply(LLMessageSystem* msg, void**)
}
}
void FSPanelSearchPeople::onAvatarNameCallback(const LLUUID& id, const LLAvatarName& av_name)
{
if (mAvatarNameCallbackConnection.connected())
{
mAvatarNameCallbackConnection.disconnect();
}
LLScrollListCtrl* search_results = getChild<LLScrollListCtrl>("search_results_people");
if (av_name.getAccountName() != "(?\?\?).(?\?\?)")
{
LLSD content;
LLSD data;
data["id"] = id;
data["columns"][0]["column"] = "icon";
data["columns"][0]["type"] = "icon";
data["columns"][0]["value"] = "icon_avatar_offline.tga";
data["columns"][1]["name"] = "username";
data["columns"][1]["value"] = av_name.getUserName();
content["name"] = av_name.getUserName();
search_results->addElement(data);
mResultsContent[id.asString()] = content;
mResultsReceived = 1;
mNumResultsReturned = 1;
search_results->setEnabled(TRUE);
search_results->selectFirstItem();
search_results->setFocus(TRUE);
onSelectItem();
}
else
{
LLStringUtil::format_map_t map;
map["[TEXT]"] = getChild<LLUICtrl>("people_edit")->getValue().asString();
search_results->setEnabled(FALSE);
search_results->setCommentText(LLTrans::getString("not_found", map));
}
}
////////////////////////////////////////
// Groups Search Panel //
////////////////////////////////////////

87
indra/newview/fsfloatersearch.h
View File

@ -55,7 +55,7 @@ struct SearchQuery : public LLInitParam::Block<SearchQuery>
{
Optional<std::string> category;
Optional<std::string> query;
SearchQuery();
};
@ -77,13 +77,13 @@ class FSPanelSearchPeople : public FSSearchPanelBase
public:
FSPanelSearchPeople();
static void processSearchReply(LLMessageSystem* msg, void**);
/*virtual*/ void focusDefaultElement();
protected:
const S32& getNumResultsReturned() const { return mNumResultsReturned; };
const S32& getNumResultsReceived() const { return mResultsReceived; };
private:
/*virtual*/ BOOL postBuild();
virtual ~FSPanelSearchPeople();
@ -92,20 +92,24 @@ private:
void onSelectItem();
void onBtnNext();
void onBtnBack();
void find();
void resetSearch();
S32 showNextButton(S32);
void setLoadingProgress(bool started);
const LLUUID& getQueryID() const { return mQueryID; }
void onAvatarNameCallback(const LLUUID& id, const LLAvatarName& av_name);
typedef boost::signals2::connection avatar_name_callback_connection_t;
avatar_name_callback_connection_t mAvatarNameCallbackConnection;
S32 mNumResultsReturned;
S32 mStartSearch;
S32 mResultsReceived;
LLSD mResultsContent;
LLUUID mQueryID;
FSFloaterSearch* mParent;
LLSearchComboBox* mSearchComboBox;
FSScrollListCtrl* mSearchResults;
@ -117,25 +121,24 @@ class FSPanelSearchGroups : public FSSearchPanelBase
public:
FSPanelSearchGroups();
static void processSearchReply(LLMessageSystem* msg, void**);
/*virtual*/ void focusDefaultElement();
private:
/*virtual*/ BOOL postBuild();
virtual ~FSPanelSearchGroups();
void onBtnFind();
void onSelectItem();
void onBtnNext();
void onBtnBack();
void find();
void resetSearch();
S32 showNextButton(S32);
void setLoadingProgress(bool started);
const LLUUID& getQueryID() const { return mQueryID; }
S32 mNumResultsReturned;
S32 mStartSearch;
S32 mResultsReceived;
@ -153,23 +156,22 @@ class FSPanelSearchPlaces : public FSSearchPanelBase
public:
FSPanelSearchPlaces();
static void processSearchReply(LLMessageSystem* msg, void**);
/*virtual*/ void focusDefaultElement();
private:
/*virtual*/ BOOL postBuild();
virtual ~FSPanelSearchPlaces();
void onBtnFind();
void onSelectItem();
void onBtnNext();
void onBtnBack();
void find();
void resetSearch();
S32 showNextButton(S32);
void setLoadingProgress(bool started);
const LLUUID& getQueryID() const { return mQueryID; }
S32 mNumResultsReturned;
@ -190,29 +192,28 @@ class FSPanelSearchLand : public FSSearchPanelBase
public:
FSPanelSearchLand();
static void processSearchReply(LLMessageSystem* msg, void**);
protected:
private:
/*virtual*/ BOOL postBuild();
virtual ~FSPanelSearchLand();
void onBtnFind();
void onSelectItem();
void onBtnNext();
void onBtnBack();
void find();
void resetSearch();
S32 showNextButton(S32);
void setLoadingProgress(bool started);
const LLUUID& getQueryID() const { return mQueryID; }
S32 mNumResultsReturned;
S32 mStartSearch;
S32 mResultsReceived;
LLSD mResultsContent;
LLUUID mQueryID;
FSFloaterSearch* mParent;
LLLineEditor* mPriceEditor;
LLLineEditor* mAreaEditor;
@ -231,17 +232,16 @@ public:
private:
/*virtual*/ BOOL postBuild();
virtual ~FSPanelSearchClassifieds();
void onBtnFind();
void onSelectItem();
void onBtnNext();
void onBtnBack();
void find();
void resetSearch();
S32 showNextButton(S32);
void setLoadingProgress(bool started);
const LLUUID& getQueryID() const { return mQueryID; }
S32 mNumResultsReturned;
@ -262,13 +262,13 @@ class FSPanelSearchEvents : public FSSearchPanelBase
public:
FSPanelSearchEvents();
static void processSearchReply(LLMessageSystem* msg, void**);
/*virtual*/ void focusDefaultElement();
private:
/*virtual*/ BOOL postBuild();
virtual ~FSPanelSearchEvents();
void onBtnFind();
void onSelectItem();
void onBtnNext();
@ -282,10 +282,9 @@ private:
void onSearchModeChanged();
void resetSearch();
S32 showNextButton(S32);
void setLoadingProgress(bool started);
const LLUUID& getQueryID() const { return mQueryID; }
S32 mNumResultsReturned;
S32 mResultsReceived;
S32 mStartSearch;
@ -312,7 +311,7 @@ public:
private:
virtual ~FSPanelSearchWeb() {};
LLMediaCtrl* mWebBrowser;
LLSD mCategoryPaths;
@ -330,19 +329,19 @@ public:
SC_PLACE,
SC_CLASSIFIED
} ESearchCategory;
struct _Params : public LLInitParam::Block<_Params, LLFloater::Params>
{
Optional<SearchQuery> search;
};
typedef LLSDParamAdapter<_Params> Params;
FSFloaterSearch(const Params& key);
~FSFloaterSearch();
void onOpen(const LLSD& key);
BOOL postBuild();
void avatarNameUpdatedCallback(const LLUUID& id, const LLAvatarName& av_name);
void groupNameUpdatedCallback(const LLUUID& id, const std::string& name, bool is_group);
void onSelectedItem(const LLUUID& selected_item, ESearchCategory type);
@ -365,7 +364,7 @@ public:
template <class T>
static T* getSearchPanel(const std::string& panel_name);
private:
virtual void onClose(bool app_quitting);
const LLUUID& getSelectedID() { return mSelectedID; }
@ -373,7 +372,7 @@ private:
LLUUID mSelectedID;
U32 mEventID;
bool mHasSelection;
void resetVerbs();
void flushDetails();
void onTabChange();
@ -386,11 +385,11 @@ private:
void onBtnEventReminder();
void onBtnTeleport();
void onBtnMap();
LLRemoteParcelInfoObserver* mRemoteParcelObserver;
LLAvatarPropertiesObserver* mAvatarPropertiesObserver;
LLGroupMgrObserver* mGroupPropertiesRequest;
FSPanelSearchPeople* mPanelPeople;
FSPanelSearchGroups* mPanelGroups;
FSPanelSearchPlaces* mPanelPlaces;
@ -398,7 +397,7 @@ private:
FSPanelSearchLand* mPanelLand;
FSPanelSearchClassifieds* mPanelClassifieds;
FSPanelSearchWeb* mPanelWeb;
LLPanel* mDetailsPanel;
LLTextEditor* mDetailTitle;
LLTextEditor* mDetailDesc;