Profile image pop-outs, user age, "currently online" shows up in green.
Metadata scrubbed clean user-side, so it's not showing data it shouldn't be. Left the code in at this time because in the event that we can implement our custom client tag options, the code could prove useful and I don't want to have to track it down in Inertia again.
Silver skin was "updated" for Ascent - That is to say, I ripped out the XUI folder so it'll use the default. Same thing.
The skins selection still isn't working. Can't figure out what I'm doing wrong. Trying to track down a developer from a client that supported that to get a clearer idea.
This commit is contained in:
Beeks
2010-08-24 19:12:29 -04:00
parent 3c97386456
commit 3b18bdc3d1
29 changed files with 618 additions and 3976 deletions

View File

@@ -60,6 +60,15 @@
#include "llviewerregion.h"
#include "llviewerwindow.h"
//For pick import and export - RK
#include "llfilepicker.h"
#include "llviewernetwork.h"
#include "llsdserialize.h"
#include "hippogridmanager.h"
//static
std::list<LLPanelPick*> LLPanelPick::sAllPanels;
@@ -82,7 +91,8 @@ LLPanelPick::LLPanelPick(BOOL top_pick)
mSortOrderText(NULL),
mSortOrderEditor(NULL),
mEnabledCheck(NULL),
mSetBtn(NULL)
mSetBtn(NULL),
mImporting(0)
{
sAllPanels.push_back(this);
@@ -189,6 +199,76 @@ void LLPanelPick::initNewPick()
sendPickInfoUpdate();
}
//Imports a new pick from an xml - RK
bool LLPanelPick::importNewPick()
{
LLFilePicker& file_picker = LLFilePicker::instance();
if(!file_picker.getOpenFile(LLFilePicker::FFLOAD_XML)) return false;// User canceled load.
else
{
std::string file = file_picker.getFirstFile();
llifstream importer(file);
LLSD data;
LLSDSerialize::fromXMLDocument(data, importer);
LLSD file_data = data["Data"];
data = LLSD();
mPickID.generate();
mCreatorID = gAgent.getID();
mPosGlobal = LLVector3d(file_data["globalPos"]);
mNameEditor->setText(file_data["name"].asString());
mDescEditor->setText(file_data["desc"].asString());
mSnapshotCtrl->setImageAssetID(file_data["snapshotID"].asUUID());
mParcelID = file_data["parcelID"].asUUID();
mLocationText = file_data["locationText"].asString();
mImporting = true;
sendPickInfoUpdate();
return true;
}
}
//Exports a pick to an XML - RK
void LLPanelPick::exportPick()
{
LLFilePicker& file_picker = LLFilePicker::instance();
if(!file_picker.getSaveFile(LLFilePicker::FFSAVE_XML))
return;// User canceled save.
std::string destination = file_picker.getFirstFile();
LLSD datas;
datas["name"] = mNameEditor->getText();
datas["desc"] = mDescEditor->getText();
datas["parcelID"] = mParcelID;
datas["snapshotID"] = mSnapshotCtrl->getImageAssetID();
datas["globalPos"] = mPosGlobal.getValue();
datas["locationText"] = mLocationText;
LLSD file;
LLSD header;
header["Version"] = 2;
file["Header"] = header;
std::string grid_uri = gHippoGridManager->getConnectedGrid()->getLoginUri();
//LLStringUtil::toLower(uris[0]);
file["Grid"] = grid_uri;
file["Data"] = datas;
// Create a file stream and write to it
llofstream export_file(destination);
LLSDSerialize::toPrettyXML(file, export_file);
// Open the file save dialog
export_file.close();
}
void LLPanelPick::setPickID(const LLUUID& pick_id, const LLUUID& creator_id)
{
@@ -321,6 +401,15 @@ void LLPanelPick::processPickInfoReply(LLMessageSystem *msg, void **)
location_text.append(sim_name);
location_text.append(" ");
//Fix for location text importing - RK
for (panel_list_t::iterator iter = sAllPanels.begin(); iter != sAllPanels.end(); ++iter)
{
LLPanelPick* self = *iter;
if(!self->mImporting) self->mLocationText = location_text;
else location_text = self->mLocationText;
self->mImporting = false;
}
LLVector3d pos_global;
msg->getVector3d("Data", "PosGlobal", pos_global);
@@ -403,6 +492,9 @@ void LLPanelPick::refresh()
mSetBtn->setVisible(godlike);
mSetBtn->setEnabled(godlike);
}
else
{
mSnapshotCtrl->setEnabled(is_self);
@@ -423,6 +515,9 @@ void LLPanelPick::refresh()
}
// static
void LLPanelPick::onClickTeleport(void* data)
{
@@ -456,6 +551,12 @@ void LLPanelPick::onClickLandmark(void* data)
// static
void LLPanelPick::onClickSet(void* data)
{
LLPanelPick* self = (LLPanelPick*)data;
// Save location for later.