Commit f5ea76a7 authored by Cinder's avatar Cinder
Browse files

Light upkeep

parent d9c70f24
......@@ -562,9 +562,8 @@ void LLFloaterDirectory::processSearchPeopleReply(LLMessageSystem* msg, void**)
{
LL_DEBUGS("Search") << "Got: " << first_name << " " << last_name << " AgentID: " << agent_id << LL_ENDL;
pResults->setEnabled(TRUE);
std::string avatar_name;
avatar_name = LLCacheName::buildFullName(first_name, last_name);
std::string avatar_name = LLCacheName::buildFullName(first_name, last_name);
LLSD element;
element["id"] = agent_id;
......@@ -789,7 +788,7 @@ void LLFloaterDirectory::processSearchPlacesReply(LLMessageSystem* msg, void**)
element["columns"][1]["column"] = "name";
element["columns"][1]["value"] = name;
std::string buffer = llformat("%.0f", (F64)dwell);
std::string buffer = llformat("%.0f", dwell);
element["columns"][2]["column"] = "dwell";
element["columns"][2]["value"] = buffer;
......@@ -1143,9 +1142,9 @@ void LLFloaterDirectory::processSearchEventsReply(LLMessageSystem* msg, void**)
//msg->getU32( "QueryReplies", "UnixTime", unix_time, i);
msg->getU32( "QueryReplies", "EventFlags", event_flags,i);
static LLUICachedControl<bool> inc_pg("ShowPGEvents", 1);
static LLUICachedControl<bool> inc_mature("ShowMatureEvents", 0);
static LLUICachedControl<bool> inc_adult("ShowAdultEvents", 0);
static LLUICachedControl<bool> inc_pg("ShowPGEvents", true);
static LLUICachedControl<bool> inc_mature("ShowMatureEvents", false);
static LLUICachedControl<bool> inc_adult("ShowAdultEvents", false);
// Skip empty events...
if (owner_id.isNull())
......
......@@ -63,7 +63,6 @@ struct SearchQuery : public LLInitParam::Block<SearchQuery>
typedef struct dir_query
{
public:
dir_query()
: type(SE_UNDEFINED), text(LLStringUtil::null), scope(0),
category_int(0), category_char(0x0), price(0), area(0), results_per_page(100) {}
......@@ -87,7 +86,7 @@ class LLFloaterDirectory : public LLFloater
friend class LLPanelSearchPlaces;
public:
struct _Params : public LLInitParam::Block<_Params, LLFloater::Params>
struct _Params : LLInitParam::Block<_Params, LLFloater::Params>
{
Optional<SearchQuery> search;
};
......
......@@ -40,14 +40,9 @@
#include "llavataractions.h"
#include "llcallingcard.h" // for LLAvatarTracker
#include "lllogchat.h"
#include "llparcel.h"
#include "llviewermenu.h" // for gMenuHolder
#include "llconversationmodel.h"
#include "llviewerobjectlist.h"
#include "llviewerparcelmgr.h"
#include "llviewerregion.h"
#include "llvoavatarself.h"
#include "roles_constants.h"
namespace LLPanelPeopleMenus
{
......
......@@ -36,6 +36,7 @@
LLPanelSearch::LLPanelSearch()
: LLPanel()
, mFloater(nullptr)
{
}
......
......@@ -40,7 +40,7 @@ class LLPanelSearch : public LLPanel
{
public:
LLPanelSearch();
/* virtual */ BOOL postBuild() override { return FALSE; }
BOOL postBuild() override { return FALSE; }
void setSearchFloater(LLFloaterDirectory* floater);
protected:
......
......@@ -62,9 +62,8 @@ BOOL LLPanelSearchClassifieds::postBuild()
mClassifiedsCategory = getChild<LLComboBox>("classifieds_category");
mClassifiedsCategory->add("All categories", LLSD("any"));
mClassifiedsCategory->addSeparator();
LLClassifiedInfo::cat_map::iterator iter;
for (iter = LLClassifiedInfo::sCategories.begin();
iter != LLClassifiedInfo::sCategories.end();
for (auto iter = LLClassifiedInfo::sCategories.cbegin();
iter != LLClassifiedInfo::sCategories.cend();
++iter)
{
mClassifiedsCategory->add(LLTrans::getString(iter->second));
......@@ -99,9 +98,9 @@ void LLPanelSearchClassifieds::search()
query.category_int = mClassifiedsCategory->getValue().asInteger();
static LLUICachedControl<bool> inc_pg("ShowPGClassifieds", 1);
static LLUICachedControl<bool> inc_mature("ShowMatureClassifieds", 0);
static LLUICachedControl<bool> inc_adult("ShowAdultClassifieds", 0);
static LLUICachedControl<bool> inc_pg("ShowPGClassifieds", true);
static LLUICachedControl<bool> inc_mature("ShowMatureClassifieds", false);
static LLUICachedControl<bool> inc_adult("ShowAdultClassifieds", false);
if (!(inc_pg || inc_mature || inc_adult))
{
LLNotificationsUtil::add("NoContentToSearch");
......
......@@ -114,11 +114,10 @@ void LLPanelSearchEvents::search()
void LLPanelSearchEvents::setDate(S32 day)
{
mDate = day;
struct tm* internal_time;
time_t utc = time_corrected();
utc += day * 24 * 60 * 60;
internal_time = utc_to_pacific_time(utc, is_daylight_savings());
struct tm * internal_time = utc_to_pacific_time(utc, is_daylight_savings());
const std::string date = llformat("%d/%d", 1 + internal_time->tm_mon, internal_time->tm_mday);
childSetValue("events_date", date);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment