Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bunch of excess clean up from while I was working on things

Browse Source
This commit is contained in:
Liru Færs
2019-10-10 02:49:17 -04:00
parent 0409a81e36
commit d16ff5cb5c
4 changed files with 2 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
indra/newview/llfloaterland.cpp
View File

@@ -857,13 +857,6 @@ void LLPanelLandGeneral::refreshNames()
} }
} }
// virtual
void LLPanelLandGeneral::draw()
{
LLPanel::draw();
}
void LLPanelLandGeneral::onClickSetGroup() void LLPanelLandGeneral::onClickSetGroup()
{ {
LLFloater* parent_floater = gFloaterView->getParentFloater(this); LLFloater* parent_floater = gFloaterView->getParentFloater(this);
@@ -1144,7 +1137,6 @@ BOOL LLPanelLandObjects::postBuild()
mOwnerList = getChild<LLNameListCtrl>("owner list"); mOwnerList = getChild<LLNameListCtrl>("owner list");
mOwnerList->sortByColumnIndex(3, FALSE); mOwnerList->sortByColumnIndex(3, FALSE);
mOwnerList->setCommitCallback(boost::bind(&LLPanelLandObjects::onCommitList,this)); mOwnerList->setCommitCallback(boost::bind(&LLPanelLandObjects::onCommitList,this));
mOwnerList->setDoubleClickCallback(boost::bind(&LLPanelLandObjects::onDoubleClickOwner, this));
return TRUE; return TRUE;
} }
@@ -1156,35 +1148,6 @@ BOOL LLPanelLandObjects::postBuild()
LLPanelLandObjects::~LLPanelLandObjects() LLPanelLandObjects::~LLPanelLandObjects()
{ } { }
// static
void LLPanelLandObjects::onDoubleClickOwner(void *userdata)
{
LLPanelLandObjects *self = (LLPanelLandObjects *)userdata;
LLScrollListItem* item = self->mOwnerList->getFirstSelected();
if (item)
{
LLUUID owner_id = item->getUUID();
// Look up the selected name, for future dialog box use.
const LLScrollListCell* cell;
cell = item->getColumn(1);
if (!cell)
{
return;
}
// Is this a group?
BOOL is_group = cell->getValue().asString() == OWNER_GROUP;
if (is_group)
{
LLGroupActions::show(owner_id);
}
else
{
LLAvatarActions::showProfile(owner_id);
}
}
}
// public // public
void LLPanelLandObjects::refresh() void LLPanelLandObjects::refresh()
{ {
@@ -1298,12 +1261,6 @@ void LLPanelLandObjects::refresh()
} }
} }
// virtual
void LLPanelLandObjects::draw()
{
LLPanel::draw();
}
void send_other_clean_time_message(S32 parcel_local_id, S32 other_clean_time) void send_other_clean_time_message(S32 parcel_local_id, S32 other_clean_time)
{ {
LLMessageSystem *msg = gMessageSystem; LLMessageSystem *msg = gMessageSystem;

4
indra/newview/llfloaterland.h
View File

@@ -145,7 +145,6 @@ public:
virtual ~LLPanelLandGeneral(); virtual ~LLPanelLandGeneral();
/*virtual*/ void refresh(); /*virtual*/ void refresh();
void refreshNames(); void refreshNames();
virtual void draw();
void setGroup(const LLUUID& group_id); void setGroup(const LLUUID& group_id);
void onClickSetGroup(); void onClickSetGroup();
@@ -243,7 +242,6 @@ public:
LLPanelLandObjects(LLSafeHandle<LLParcelSelection>& parcelp); LLPanelLandObjects(LLSafeHandle<LLParcelSelection>& parcelp);
virtual ~LLPanelLandObjects(); virtual ~LLPanelLandObjects();
/*virtual*/ void refresh(); /*virtual*/ void refresh();
virtual void draw();
bool callbackReturnOwnerObjects(const LLSD& notification, const LLSD& response); bool callbackReturnOwnerObjects(const LLSD& notification, const LLSD& response);
bool callbackReturnGroupObjects(const LLSD& notification, const LLSD& response); bool callbackReturnGroupObjects(const LLSD& notification, const LLSD& response);
@@ -261,8 +259,6 @@ public:
static void onClickReturnOwnerList(void*); static void onClickReturnOwnerList(void*);
static void onClickRefresh(void*); static void onClickRefresh(void*);
static void onDoubleClickOwner(void*);
void onCommitList(); void onCommitList();
static void onLostFocus(LLFocusableElement* caller, void* user_data); static void onLostFocus(LLFocusableElement* caller, void* user_data);
static void onCommitClean(LLUICtrl* caller, void* user_data); static void onCommitClean(LLUICtrl* caller, void* user_data);

2
indra/newview/llpanelpermissions.cpp
View File

@@ -327,7 +327,7 @@ void LLPanelPermissions::refresh()
const LLFocusableElement* keyboard_focus_view = gFocusMgr.getKeyboardFocus(); const LLFocusableElement* keyboard_focus_view = gFocusMgr.getKeyboardFocus();
S32 string_index = 0; S32 string_index = 0;
std::string MODIFY_INFO_STRINGS[] = static std::string MODIFY_INFO_STRINGS[] =
{ {
getString("text modify info 1"), getString("text modify info 1"),
getString("text modify info 2"), getString("text modify info 2"),

2
indra/newview/llviewermessage.cpp
View File

@@ -8607,7 +8607,7 @@ void process_covenant_reply(LLMessageSystem* msg, void**)
} }
else else
{ {
last_modified = LLTrans::getString("covenant_modified") + " " + formatted_time((time_t)covenant_timestamp); last_modified = LLTrans::getString("covenant_modified") + ' ' + formatted_time((time_t)covenant_timestamp);
} }
LLPanelEstateCovenant::updateLastModified(last_modified); LLPanelEstateCovenant::updateLastModified(last_modified);