aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpaneldirbrowser.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llpaneldirbrowser.cpp')
-rw-r--r--linden/indra/newview/llpaneldirbrowser.cpp40
1 files changed, 15 insertions, 25 deletions
diff --git a/linden/indra/newview/llpaneldirbrowser.cpp b/linden/indra/newview/llpaneldirbrowser.cpp
index f701bf4..7f15a85 100644
--- a/linden/indra/newview/llpaneldirbrowser.cpp
+++ b/linden/indra/newview/llpaneldirbrowser.cpp
@@ -400,8 +400,8 @@ void LLPanelDirBrowser::showEvent(const U32 event_id)
400void LLPanelDirBrowser::processDirPeopleReply(LLMessageSystem *msg, void**) 400void LLPanelDirBrowser::processDirPeopleReply(LLMessageSystem *msg, void**)
401{ 401{
402 LLUUID query_id; 402 LLUUID query_id;
403 char first_name[DB_FIRST_NAME_BUF_SIZE]; 403 char first_name[DB_FIRST_NAME_BUF_SIZE]; /* Flawfinder: ignore */
404 char last_name[DB_LAST_NAME_BUF_SIZE]; 404 char last_name[DB_LAST_NAME_BUF_SIZE]; /* Flawfinder: ignore */
405 LLUUID agent_id; 405 LLUUID agent_id;
406 406
407 msg->getUUIDFast(_PREHASH_QueryData,_PREHASH_QueryID, query_id); 407 msg->getUUIDFast(_PREHASH_QueryData,_PREHASH_QueryID, query_id);
@@ -471,9 +471,7 @@ void LLPanelDirBrowser::processDirPeopleReply(LLMessageSystem *msg, void**)
471 content["name"] = fullname; 471 content["name"] = fullname;
472 472
473 list->addElement(row); 473 list->addElement(row);
474 474 self->mResultsContents[agent_id.asString()] = content;
475 LLString id_str = agent_id.getString();
476 self->mResultsContents[id_str] = content;
477 } 475 }
478 476
479 list->sortByColumn(self->mCurrentSortColumn, self->mCurrentSortAscending); 477 list->sortByColumn(self->mCurrentSortColumn, self->mCurrentSortAscending);
@@ -490,7 +488,7 @@ void LLPanelDirBrowser::processDirPlacesReply(LLMessageSystem* msg, void**)
490 LLUUID agent_id; 488 LLUUID agent_id;
491 LLUUID query_id; 489 LLUUID query_id;
492 LLUUID parcel_id; 490 LLUUID parcel_id;
493 char name[MAX_STRING]; 491 char name[MAX_STRING]; /*Flawfinder: ignore*/
494 BOOL is_for_sale; 492 BOOL is_for_sale;
495 BOOL is_auction; 493 BOOL is_auction;
496 BOOL is_newbie; 494 BOOL is_newbie;
@@ -552,9 +550,7 @@ void LLPanelDirBrowser::processDirPlacesReply(LLMessageSystem* msg, void**)
552 row["columns"][3]["font"] = "SANSSERIFSMALL"; 550 row["columns"][3]["font"] = "SANSSERIFSMALL";
553 551
554 list->addElement(row); 552 list->addElement(row);
555 553 self->mResultsContents[parcel_id.asString()] = content;
556 LLString id_str = parcel_id.getString();
557 self->mResultsContents[id_str] = content;
558 } 554 }
559 555
560 list->sortByColumn(self->mCurrentSortColumn, self->mCurrentSortAscending); 556 list->sortByColumn(self->mCurrentSortColumn, self->mCurrentSortAscending);
@@ -572,7 +568,7 @@ void LLPanelDirBrowser::processDirPopularReply(LLMessageSystem *msg, void**)
572 LLUUID agent_id; 568 LLUUID agent_id;
573 LLUUID query_id; 569 LLUUID query_id;
574 LLUUID parcel_id; 570 LLUUID parcel_id;
575 char name[MAX_STRING]; 571 char name[MAX_STRING]; /*Flawfinder: ignore*/
576 F32 dwell; 572 F32 dwell;
577 573
578 msg->getUUID("AgentData", "AgentID", agent_id); 574 msg->getUUID("AgentData", "AgentID", agent_id);
@@ -634,9 +630,7 @@ void LLPanelDirBrowser::processDirPopularReply(LLMessageSystem *msg, void**)
634 row["columns"][2]["font"] = "SANSSERIFSMALL"; 630 row["columns"][2]["font"] = "SANSSERIFSMALL";
635 631
636 list->addElement(row); 632 list->addElement(row);
637 633 self->mResultsContents[parcel_id.asString()] = content;
638 LLString id_str = parcel_id.getString();
639 self->mResultsContents[id_str] = content;
640 } 634 }
641 635
642 list->sortByColumn(self->mCurrentSortColumn, self->mCurrentSortAscending); 636 list->sortByColumn(self->mCurrentSortColumn, self->mCurrentSortAscending);
@@ -653,8 +647,8 @@ void LLPanelDirBrowser::processDirEventsReply(LLMessageSystem* msg, void**)
653 LLUUID agent_id; 647 LLUUID agent_id;
654 LLUUID query_id; 648 LLUUID query_id;
655 LLUUID owner_id; 649 LLUUID owner_id;
656 char name[MAX_STRING]; 650 char name[MAX_STRING]; /*Flawfinder: ignore*/
657 char date[MAX_STRING]; 651 char date[MAX_STRING]; /*Flawfinder: ignore*/
658 BOOL show_mature = gSavedSettings.getBOOL("ShowMatureEvents"); 652 BOOL show_mature = gSavedSettings.getBOOL("ShowMatureEvents");
659 653
660 msg->getUUID("AgentData", "AgentID", agent_id); 654 msg->getUUID("AgentData", "AgentID", agent_id);
@@ -771,7 +765,7 @@ void LLPanelDirBrowser::processDirGroupsReply(LLMessageSystem* msg, void**)
771 765
772 LLUUID query_id; 766 LLUUID query_id;
773 LLUUID group_id; 767 LLUUID group_id;
774 char group_name[DB_GROUP_NAME_BUF_SIZE]; 768 char group_name[DB_GROUP_NAME_BUF_SIZE]; /*Flawfinder: ignore*/
775 S32 members; 769 S32 members;
776 BOOL open_enrollment; 770 BOOL open_enrollment;
777 S32 membership_fee; 771 S32 membership_fee;
@@ -836,8 +830,7 @@ void LLPanelDirBrowser::processDirGroupsReply(LLMessageSystem* msg, void**)
836 row["columns"][2]["font"] = "SANSSERIFSMALL"; 830 row["columns"][2]["font"] = "SANSSERIFSMALL";
837 831
838 list->addElement(row); 832 list->addElement(row);
839 LLString id_str = group_id.getString(); 833 self->mResultsContents[group_id.asString()] = content;
840 self->mResultsContents[id_str] = content;
841 } 834 }
842 list->sortByColumn(self->mCurrentSortColumn, self->mCurrentSortAscending); 835 list->sortByColumn(self->mCurrentSortColumn, self->mCurrentSortAscending);
843 self->updateResultCount(); 836 self->updateResultCount();
@@ -890,7 +883,7 @@ void LLPanelDirBrowser::processDirClassifiedReply(LLMessageSystem* msg, void**)
890 for (i = 0; i < num_new_rows; i++) 883 for (i = 0; i < num_new_rows; i++)
891 { 884 {
892 LLUUID classified_id; 885 LLUUID classified_id;
893 char name[DB_PARCEL_NAME_SIZE]; 886 char name[DB_PARCEL_NAME_SIZE]; /*Flawfinder: ignore*/
894 U32 creation_date = 0; // unix timestamp 887 U32 creation_date = 0; // unix timestamp
895 U32 expiration_date = 0; // future use 888 U32 expiration_date = 0; // future use
896 S32 price_for_listing = 0; 889 S32 price_for_listing = 0;
@@ -907,9 +900,7 @@ void LLPanelDirBrowser::processDirClassifiedReply(LLMessageSystem* msg, void**)
907 LLSD content; 900 LLSD content;
908 content["type"] = CLASSIFIED_CODE; 901 content["type"] = CLASSIFIED_CODE;
909 content["name"] = name; 902 content["name"] = name;
910 903 self->mResultsContents[classified_id.asString()] = content;
911 LLString id_str = classified_id.getString();
912 self->mResultsContents[id_str] = content;
913 } 904 }
914 } 905 }
915 // The server does the initial sort, by price paid per listing and date. JC 906 // The server does the initial sort, by price paid per listing and date. JC
@@ -925,7 +916,7 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
925 LLUUID agent_id; 916 LLUUID agent_id;
926 LLUUID query_id; 917 LLUUID query_id;
927 LLUUID parcel_id; 918 LLUUID parcel_id;
928 char name[MAX_STRING]; 919 char name[MAX_STRING]; /*Flawfinder: ignore*/
929 BOOL auction; 920 BOOL auction;
930 BOOL for_sale; 921 BOOL for_sale;
931 S32 sale_price; 922 S32 sale_price;
@@ -1033,8 +1024,7 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
1033 } 1024 }
1034 1025
1035 list->addElement(row); 1026 list->addElement(row);
1036 LLString id_str = parcel_id.getString(); 1027 self->mResultsContents[parcel_id.asString()] = content;
1037 self->mResultsContents[id_str] = content;
1038 } 1028 }
1039 1029
1040 // All auction results are shown on the first page 1030 // All auction results are shown on the first page