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

rename the DOInventoryBackup class back to the original for consistency with the other sourcebase, fix Imprudence tag to be purple (as it should be)

Browse Source
This commit is contained in:
Hazim Gazov
2010-05-13 07:11:00 -03:00
parent 01dfa8ab6f
commit 7df897c585
11 changed files with 63 additions and 1001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/dofloaterhex.cpp
View File

@@ -13,7 +13,7 @@
#include "dofloaterhex.h"
#include "lluictrlfactory.h"
#include "doinventorybackup.h" // for downloading
#include "llinventorybackup.h" // for downloading
#include "llviewercontrol.h" // gSavedSettings
#include "llviewerwindow.h" // alertXML
#include "llagent.h" // gAgent getID
@@ -109,7 +109,7 @@ BOOL DOFloaterHex::postBuild(void)
// Load the asset
editor->setVisible(FALSE);
childSetText("status_text", std::string("Loading..."));
DOInventoryBackup::download(mItem, this, imageCallback, assetCallback);
LLInventoryBackup::download(mItem, this, imageCallback, assetCallback);
#if OPENSIM_RULES!=1
} else {
this->close(false);
@@ -130,7 +130,7 @@ void DOFloaterHex::imageCallback(BOOL success,
{
if(final)
{
DOInventoryBackup::callbackdata* data = static_cast<DOInventoryBackup::callbackdata*>(userdata);
LLInventoryBackup::callbackdata* data = static_cast<LLInventoryBackup::callbackdata*>(userdata);
DOFloaterHex* floater = (DOFloaterHex*)(data->floater);
if(!floater) return;
if(std::find(sInstances.begin(), sInstances.end(), floater) == sInstances.end()) return; // no more crash
@@ -168,7 +168,7 @@ void DOFloaterHex::assetCallback(LLVFS *vfs,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status)
{
DOInventoryBackup::callbackdata* data = static_cast<DOInventoryBackup::callbackdata*>(user_data);
LLInventoryBackup::callbackdata* data = static_cast<LLInventoryBackup::callbackdata*>(user_data);
DOFloaterHex* floater = (DOFloaterHex*)(data->floater);
if(!floater) return;
if(std::find(sInstances.begin(), sInstances.end(), floater) == sInstances.end()) return; // no more crash