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

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

Browse Source 
Conflicts:
	indra/llmessage/llurlrequest.cpp
	indra/newview/llvoavatar.cpp
This commit is contained in:
Siana Gearz
2012-11-12 06:46:58 +01:00
parent 59d4d833f1 d518222340
commit 303c74f4c9
200 changed files with 19362 additions and 3255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llfloaterreporter.cpp
View File

@@ -32,19 +32,19 @@
#include "llviewerprecompiledheaders.h"
#include <sstream>
// self include
#include "llfloaterreporter.h"
#include <sstream>
// linden library includes
#include "llassetstorage.h"
#include "llcachename.h"
#include "llfontgl.h"
#include "llgl.h" // for renderer
#include "llimagej2c.h"
#include "llinventory.h"
#include "llnotificationsutil.h"
#include "llimagej2c.h"
#include "llstring.h"
#include "llsys.h"
#include "sgversion.h"
@@ -86,6 +86,8 @@
#include "llassetuploadresponders.h"
#include "lltrans.h"
// <edit>
#include "llviewercontrol.h"
// </edit>
@@ -397,6 +399,7 @@ void LLFloaterReporter::callbackAvatarID(const std::vector<std::string>& names,
};
}
// static
void LLFloaterReporter::onClickSend(void *userdata)
{
@@ -443,7 +446,7 @@ void LLFloaterReporter::onClickSend(void *userdata)
}
}
LLUploadDialog::modalUploadDialog("Uploading...\n\nReport");
LLUploadDialog::modalUploadDialog(LLTrans::getString("uploading_abuse_report"));
// *TODO don't upload image if checkbox isn't checked
std::string url = gAgent.getRegion()->getCapability("SendUserReport");
std::string sshot_url = gAgent.getRegion()->getCapability("SendUserReportWithScreenshot");
@@ -584,7 +587,7 @@ void LLFloaterReporter::showFromObject(const LLUUID& object_id)
}
// static
// static
LLFloaterReporter* LLFloaterReporter::getReporter(EReportType report_type)
{
LLFloaterReporter *self = NULL;
@@ -947,7 +950,7 @@ void LLFloaterReporter::takeScreenshot()
{
texture->setImageAssetID(mResourceDatap->mAssetInfo.mUuid);
texture->setDefaultImageAssetID(mResourceDatap->mAssetInfo.mUuid);
texture->setCaption(std::string("Screenshot"));
texture->setCaption(getString("Screenshot"));
}
}