livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP SH-3339. Commit to merge from trunk to get build fixes, etc.

master
Logan Dethrow 2012-12-13 18:07:50 -05:00
parent 632addf63d
commit 3565f6f36d
3 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llappearancemgr.h
View File

@ -191,6 +191,9 @@ public:
void incrementCofVersion(LLHTTPClient::ResponderPtr responder_ptr = NULL);
// *HACK Remove this after server side texture baking is deployed on all sims.
void incrementCofVersionLegacy();
protected:
LLAppearanceMgr();
~LLAppearanceMgr();

54
indra/newview/llpaneleditwearable.cpp
View File

@ -1028,33 +1028,43 @@ void LLPanelEditWearable::updatePanelPickerControls(LLWearableType::EType type)
}
}
void LLPanelEditWearable::incrementCofVersionLegacy()
{
}
void LLPanelEditWearable::saveChanges(bool force_save_as)
{
if (!mWearablePtr || !isDirty())
{
// do nothing if no unsaved changes
return;
}
if (!mWearablePtr || !isDirty())
{
// do nothing if no unsaved changes
return;
}
U32 index = gAgentWearables.getWearableIndex(mWearablePtr);
U32 index = gAgentWearables.getWearableIndex(mWearablePtr);
std::string new_name = mNameEditor->getText();
if (force_save_as)
{
// the name of the wearable has changed, re-save wearable with new name
LLAppearanceMgr::instance().removeCOFItemLinks(mWearablePtr->getItemID());
gAgentWearables.saveWearableAs(mWearablePtr->getType(), index, new_name, FALSE);
mNameEditor->setText(mWearableItem->getName());
}
else
{
gAgentWearables.saveWearable(mWearablePtr->getType(), index, TRUE, new_name);
}
std::string new_name = mNameEditor->getText();
if (force_save_as)
{
// the name of the wearable has changed, re-save wearable with new name
LLAppearanceMgr::instance().removeCOFItemLinks(mWearablePtr->getItemID());
gAgentWearables.saveWearableAs(mWearablePtr->getType(), index, new_name, FALSE);
mNameEditor->setText(mWearableItem->getName());
}
else
{
gAgentWearables.saveWearable(mWearablePtr->getType(), index, TRUE, new_name);
}
if (gAgentAvatarp->isUsingServerBakes())
{
LLAppearanceMgr::getInstance()->incrementCofVersion();
}
if (getRegion() && getRegion()->getCentralBakeVersion() > 0)
{
LLAppearanceMgr::getInstance()->incrementCofVersion();
}
else
{
// *HACK This should be removed when all regions support the IncrementCOFVersion capability.
incrementCofVersionLegacy();
}
}
void LLPanelEditWearable::revertChanges()

3
indra/newview/llpaneleditwearable.h
View File

@ -113,6 +113,9 @@ private:
void setWearablePanelVisibilityChangeCallback(LLPanel* bodypart_panel);
// *HACK Remove this when serverside texture baking is available on all regions.
void incrementCofVersionLegacy();
// the pointer to the wearable we're editing. NULL means we're not editing a wearable.
LLViewerWearable *mWearablePtr;
LLViewerInventoryItem* mWearableItem;