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

LLFloaterInspect: bit of cleanup and allow sorting by creation date regardless of format

Browse Source
This commit is contained in:
Inusaito Sayori
2013-10-18 08:21:57 -04:00
parent ec5aaa2af8
commit 7813ca03da
2 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
indra/newview/llfloaterinspect.cpp
View File

@@ -89,7 +89,6 @@ LLFloaterInspect::~LLFloaterInspect(void)
{ {
gFloaterTools->setFocus(TRUE); gFloaterTools->setFocus(TRUE);
} }
//sInstance = NULL;
} }
// static // static
@@ -199,15 +198,6 @@ LLUUID LLFloaterInspect::getSelectedUUID()
return LLUUID::null; return LLUUID::null;
} }
void LLFloaterInspect::onGetAvNameCallback(const LLUUID& idCreator, const LLAvatarName& av_name, void* FloaterPtr)
{
if (FloaterPtr)
{
LLFloaterInspect* floater = (LLFloaterInspect*)FloaterPtr;
floater->dirty();
}
}
void LLFloaterInspect::refresh() void LLFloaterInspect::refresh()
{ {
LLUUID creator_id; LLUUID creator_id;
@@ -234,15 +224,14 @@ void LLFloaterInspect::refresh()
{ {
LLSelectNode* obj = *iter; LLSelectNode* obj = *iter;
LLSD row; LLSD row;
std::string owner_name, creator_name, time, last_owner_name; std::string owner_name, creator_name, last_owner_name;
if (obj->mCreationDate == 0) if (obj->mCreationDate == 0)
{ // Don't have valid information from the server, so skip this one { // Don't have valid information from the server, so skip this one
continue; continue;
} }
time_t timestamp = (time_t) (obj->mCreationDate/1000000); // Singu Note: Diverge from LL and handle datetime column in a sortable manner later on
timeToFormattedString(timestamp, gSavedSettings.getString("TimestampFormat"), time);
const LLUUID& idOwner = obj->mPermissions->getOwner(); const LLUUID& idOwner = obj->mPermissions->getOwner();
const LLUUID& idCreator = obj->mPermissions->getCreator(); const LLUUID& idCreator = obj->mPermissions->getCreator();
@@ -266,7 +255,7 @@ void LLFloaterInspect::refresh()
else else
{ {
owner_name = LLTrans::getString("RetrievingData"); owner_name = LLTrans::getString("RetrievingData");
LLAvatarNameCache::get(idOwner, boost::bind(&LLFloaterInspect::onGetAvNameCallback, _1, _2, this)); LLAvatarNameCache::get(idOwner, boost::bind(&LLFloaterInspect::dirty, this));
} }
if (LLAvatarNameCache::get(idCreator, &av_name)) if (LLAvatarNameCache::get(idCreator, &av_name))
@@ -283,7 +272,7 @@ void LLFloaterInspect::refresh()
else else
{ {
creator_name = LLTrans::getString("RetrievingData"); creator_name = LLTrans::getString("RetrievingData");
LLAvatarNameCache::get(idCreator, boost::bind(&LLFloaterInspect::onGetAvNameCallback, _1, _2, this)); LLAvatarNameCache::get(idCreator, boost::bind(&LLFloaterInspect::dirty, this));
} }
// <edit> // <edit>
@@ -300,7 +289,7 @@ void LLFloaterInspect::refresh()
else else
{ {
last_owner_name = LLTrans::getString("RetrievingData"); last_owner_name = LLTrans::getString("RetrievingData");
LLAvatarNameCache::get(idLastOwner, boost::bind(&LLFloaterInspect::onGetAvNameCallback, _1, _2, this)); LLAvatarNameCache::get(idLastOwner, boost::bind(&LLFloaterInspect::dirty, this));
} }
// </edit> // </edit>
@@ -363,8 +352,10 @@ void LLFloaterInspect::refresh()
row["columns"][7]["value"] = llformat("%d",total_inv); row["columns"][7]["value"] = llformat("%d",total_inv);
// </edit> // </edit>
row["columns"][8]["column"] = "creation_date"; row["columns"][8]["column"] = "creation_date";
row["columns"][8]["type"] = "text"; row["columns"][8]["type"] = "date";
row["columns"][8]["value"] = time; row["columns"][8]["value"] = LLDate(obj->mCreationDate/1000000);
static const LLCachedControl<std::string> format("TimestampFormat");
row["columns"][8]["format"] = format;
mObjectList->addElement(row, ADD_TOP); mObjectList->addElement(row, ADD_TOP);
} }
if(selected_index > -1 && mObjectList->getItemIndex(selected_uuid) == selected_index) if(selected_index > -1 && mObjectList->getItemIndex(selected_uuid) == selected_index)

4
indra/newview/llfloaterinspect.h
View File

@@ -63,8 +63,6 @@ public:
void onClickOwnerProfile(); void onClickOwnerProfile();
void onSelectObject(); void onSelectObject();
static void onGetAvNameCallback(const LLUUID& idCreator, const LLAvatarName& av_name, void* FloaterPtr);
LLScrollListCtrl* mObjectList; LLScrollListCtrl* mObjectList;
protected: protected:
// protected members // protected members
@@ -77,8 +75,6 @@ protected:
private: private:
LLFloaterInspect(); LLFloaterInspect();
virtual ~LLFloaterInspect(void); virtual ~LLFloaterInspect(void);
// static data
// static LLFloaterInspect* sInstance;
LLSafeHandle<LLObjectSelection> mObjectSelection; LLSafeHandle<LLObjectSelection> mObjectSelection;
// <edit> // <edit>