From 136e6dd389fc0599040dc2a7d725f73744d2e355 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Wed, 9 Jan 2013 00:54:53 +0100 Subject: [PATCH 01/19] New debug channel dc::snapshot. --- indra/cwdebug/debug.cc | 1 + indra/cwdebug/debug.h | 1 + indra/newview/llfloatersnapshot.cpp | 78 ++++++++++++++--------------- indra/newview/llviewerwindow.cpp | 2 +- 4 files changed, 42 insertions(+), 40 deletions(-) diff --git a/indra/cwdebug/debug.cc b/indra/cwdebug/debug.cc index ed1384306..17d86d77f 100644 --- a/indra/cwdebug/debug.cc +++ b/indra/cwdebug/debug.cc @@ -239,6 +239,7 @@ void stop_recording_backtraces(void) channel_ct curl DDCN("CURL"); //!< This debug channel is used for output related to AICurl. channel_ct curlio DDCN("CURLIO"); //!< This debug channel is used to print debug output of libcurl. This includes all HTTP network traffic. channel_ct curltr DDCN("CURLTR"); //!< This debug channel is used to print libcurl API calls. + channel_ct snapshot DDCN("SNAPSHOT"); //!< This debug channel is used for output related to snapshots. } // namespace dc } // namespace DEBUGCHANNELS diff --git a/indra/cwdebug/debug.h b/indra/cwdebug/debug.h index c1b509946..329f0448e 100644 --- a/indra/cwdebug/debug.h +++ b/indra/cwdebug/debug.h @@ -208,6 +208,7 @@ extern CWD_API channel_ct caps; extern CWD_API channel_ct curl; extern CWD_API channel_ct curlio; extern CWD_API channel_ct curltr; +extern CWD_API channel_ct snapshot; #endif diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index 00701a11b..dda174656 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -383,7 +383,7 @@ LLSnapshotLivePreview::LLSnapshotLivePreview (const LLRect& rect) : mColor(1.f, 0.f, 0.f, 0.5f), mRawSnapshot(NULL), mRawSnapshotWidth(0), - mRawSnapshotHeight(0), + mRawSnapshotHeight(1), mRawSnapshotAspectRatio(1.0), mRawSnapshotRenderUI(FALSE), mRawSnapshotRenderHUD(FALSE), @@ -409,7 +409,7 @@ LLSnapshotLivePreview::LLSnapshotLivePreview (const LLRect& rect) : mSnapshotBufferType(LLViewerWindow::SNAPSHOT_TYPE_COLOR), mCloseCalled(NULL) { - DoutEntering(dc::notice, "LLSnapshotLivePreview() [" << (void*)this << "]"); + DoutEntering(dc::snapshot, "LLSnapshotLivePreview() [" << (void*)this << "]"); setSnapshotQuality(gSavedSettings.getS32("SnapshotQuality")); mSnapshotDelayTimer.start(); sList.insert(this); @@ -430,7 +430,7 @@ LLSnapshotLivePreview::LLSnapshotLivePreview (const LLRect& rect) : LLSnapshotLivePreview::~LLSnapshotLivePreview() { - DoutEntering(dc::notice, "~LLSnapshotLivePreview() [" << (void*)this << "]"); + DoutEntering(dc::snapshot, "~LLSnapshotLivePreview() [" << (void*)this << "]"); sList.erase(this); // Stop callbacks from using this object. ++sSnapshotIndex; @@ -455,7 +455,7 @@ LLViewerTexture* LLSnapshotLivePreview::getCurrentImage() void LLSnapshotLivePreview::showFreezeFrameSnapshot(bool show) { - DoutEntering(dc::notice, "LLSnapshotLivePreview::showFreezeFrameSnapshot(" << show << ")"); + DoutEntering(dc::snapshot, "LLSnapshotLivePreview::showFreezeFrameSnapshot(" << show << ")"); // If we stop to show the fullscreen "freeze frame" snapshot, play the "fall away" animation. if (mShowFreezeFrameSnapshot && !show) { @@ -471,7 +471,7 @@ void LLSnapshotLivePreview::showFreezeFrameSnapshot(bool show) void LLSnapshotLivePreview::updateSnapshot(BOOL new_snapshot, BOOL new_thumbnail, F32 delay) { - DoutEntering(dc::notice, "LLSnapshotLivePreview::updateSnapshot(" << new_snapshot << ", " << new_thumbnail << ", " << delay << ")"); + DoutEntering(dc::snapshot, "LLSnapshotLivePreview::updateSnapshot(" << new_snapshot << ", " << new_thumbnail << ", " << delay << ")"); LLRect& rect = mFullScreenImageRect; rect.set(0, getRect().getHeight(), getRect().getWidth(), 0); @@ -820,7 +820,7 @@ void LLSnapshotLivePreview::generateThumbnailImage(void) return ; } - Dout(dc::notice, "LLSnapshotLivePreview::generateThumbnailImage: Actually making a new thumbnail!"); + Dout(dc::snapshot, "LLSnapshotLivePreview::generateThumbnailImage: Actually making a new thumbnail!"); mThumbnailImage = NULL; @@ -843,7 +843,7 @@ void LLSnapshotLivePreview::generateThumbnailImage(void) { mThumbnailImage = LLViewerTextureManager::getLocalTexture(raw.get(), FALSE); mThumbnailUpToDate = TRUE ; - Dout(dc::notice, "thumbnailSnapshot(" << w << ", " << h << ", ...) returns " << raw->getWidth() << ", " << raw->getHeight()); + Dout(dc::snapshot, "thumbnailSnapshot(" << w << ", " << h << ", ...) returns " << raw->getWidth() << ", " << raw->getHeight()); } //unlock updating @@ -903,7 +903,7 @@ BOOL LLSnapshotLivePreview::onIdle(LLSnapshotLivePreview* previewp) previewp->getWindow()->incBusyCount(); // Grab the raw image and encode it into desired format. - Dout(dc::notice, "LLSnapshotLivePreview::onIdle: Actually making a new snapshot!"); + Dout(dc::snapshot, "LLSnapshotLivePreview::onIdle: Actually making a new snapshot!"); // This should never happen, but well. If it's true then that means that the // snapshot floater is disabled. Incrementing sSnapshotIndex will cause the @@ -913,7 +913,7 @@ BOOL LLSnapshotLivePreview::onIdle(LLSnapshotLivePreview* previewp) previewp->mCloseCalled->setEnabled(TRUE); } previewp->sSnapshotIndex++; - Dout(dc::notice, "sSnapshotIndex is now " << previewp->sSnapshotIndex << "; mOutstandingCallbacks reset to 0."); + Dout(dc::snapshot, "sSnapshotIndex is now " << previewp->sSnapshotIndex << "; mOutstandingCallbacks reset to 0."); previewp->mOutstandingCallbacks = 0; // There are no outstanding callbacks for THIS snapshot. previewp->mSaveFailures = 0; // There were no upload failures (or attempts for that matter) for this snapshot. @@ -930,7 +930,7 @@ BOOL LLSnapshotLivePreview::onIdle(LLSnapshotLivePreview* previewp) previewp->mRawSnapshotAspectRatio = previewp->mAspectRatio; // Mark that the those values do not represent the current snapshot (yet). previewp->mRawSnapshotWidth = 0; - previewp->mRawSnapshotHeight = 0; + previewp->mRawSnapshotHeight = 1; // Avoid division by zero when calculation an aspect in LLSnapshotLivePreview::getAspectSizeProblem. if (gViewerWindow->rawRawSnapshot( previewp->mRawSnapshot, @@ -945,7 +945,7 @@ BOOL LLSnapshotLivePreview::onIdle(LLSnapshotLivePreview* previewp) // On success, cache the size of the raw snapshot. previewp->mRawSnapshotWidth = previewp->mRawSnapshot->getWidth(); previewp->mRawSnapshotHeight = previewp->mRawSnapshot->getHeight(); - Dout(dc::notice, "Created a new raw snapshot of size " << previewp->mRawSnapshotWidth << "x" << previewp->mRawSnapshotHeight); + Dout(dc::snapshot, "Created a new raw snapshot of size " << previewp->mRawSnapshotWidth << "x" << previewp->mRawSnapshotHeight); previewp->mPosTakenGlobal = gAgentCamera.getCameraPositionGlobal(); EAspectSizeProblem ret = previewp->generateFormattedAndFullscreenPreview(); @@ -1011,7 +1011,7 @@ LLSnapshotLivePreview::EAspectSizeProblem LLSnapshotLivePreview::getAspectSizePr crop_vertically_out = false; if (!allow_horizontal_crop) { - Dout(dc::notice, "NOT up to date: required aspect " << mAspectRatio << + Dout(dc::snapshot, "NOT up to date: required aspect " << mAspectRatio << " is less than the (lower) raw aspect " << lower_raw_aspect << " which is already vertically cropped."); return CANNOT_CROP_HORIZONTALLY; } @@ -1025,7 +1025,7 @@ LLSnapshotLivePreview::EAspectSizeProblem LLSnapshotLivePreview::getAspectSizePr { if (!allow_vertical_crop) { - Dout(dc::notice, "NOT up to date: required aspect " << mAspectRatio << + Dout(dc::snapshot, "NOT up to date: required aspect " << mAspectRatio << " is larger than the (upper) raw aspect " << upper_raw_aspect << " which is already horizontally cropped."); return CANNOT_CROP_VERTICALLY; } @@ -1035,7 +1035,7 @@ LLSnapshotLivePreview::EAspectSizeProblem LLSnapshotLivePreview::getAspectSizePr // Never allow upscaling of the existing snapshot, of course. if (mWidth > width_out || mHeight > height_out) { - Dout(dc::notice, "NOT up to date: required target size " << mWidth << "x" << mHeight << + Dout(dc::snapshot, "NOT up to date: required target size " << mWidth << "x" << mHeight << " is larger than (cropped) raw snapshot with size " << width_out << "x" << height_out << "!"); return SIZE_TOO_LARGE; } @@ -1044,7 +1044,7 @@ LLSnapshotLivePreview::EAspectSizeProblem LLSnapshotLivePreview::getAspectSizePr // unless the aspect is different in which case we have to allow resizing in one direction. if (mSnapshotType == SNAPSHOT_LOCAL && (mWidth >= window_width || mHeight >= window_height) && mWidth != width_out && mHeight != height_out) { - Dout(dc::notice, "NOT up to date: required target size " << mWidth << "x" << mHeight << + Dout(dc::snapshot, "NOT up to date: required target size " << mWidth << "x" << mHeight << " is larger or equal the window size (" << window_width << "x" << window_height << ")" " but unequal the (cropped) raw snapshot size (" << width_out << "x" << height_out << ")" " and target is disk!"); @@ -1055,7 +1055,7 @@ LLSnapshotLivePreview::EAspectSizeProblem LLSnapshotLivePreview::getAspectSizePr LLSnapshotLivePreview::EAspectSizeProblem LLSnapshotLivePreview::generateFormattedAndFullscreenPreview(bool delayed) { - DoutEntering(dc::notice, "LLSnapshotLivePreview::generateFormattedAndFullscreenPreview(" << delayed << ")"); + DoutEntering(dc::snapshot, "LLSnapshotLivePreview::generateFormattedAndFullscreenPreview(" << delayed << ")"); mFormattedUpToDate = false; S32 w, h, crop_offset; @@ -1101,7 +1101,7 @@ LLSnapshotLivePreview::EAspectSizeProblem LLSnapshotLivePreview::generateFormatt (mFormattedSnapshotQuality == mSnapshotQuality || format != LLFloaterSnapshot::SNAPSHOT_FORMAT_JPEG)) { - Dout(dc::notice, "Already up to date."); + Dout(dc::snapshot, "Already up to date."); mFormattedUpToDate = true; return ret; } @@ -1109,43 +1109,43 @@ LLSnapshotLivePreview::EAspectSizeProblem LLSnapshotLivePreview::generateFormatt #ifdef CWDEBUG if (!mFormattedImage) { - Dout(dc::notice, "mFormattedImage == NULL!"); + Dout(dc::snapshot, "mFormattedImage == NULL!"); } else { if (mFormattedWidth != mWidth) - Dout(dc::notice, "Target width changed from " << mFormattedWidth << " to " << mWidth); + Dout(dc::snapshot, "Target width changed from " << mFormattedWidth << " to " << mWidth); if (mFormattedHeight != mHeight) - Dout(dc::notice, "Target height changed from " << mFormattedHeight << " to " << mHeight); + Dout(dc::snapshot, "Target height changed from " << mFormattedHeight << " to " << mHeight); if (mFormattedRawWidth != w) - Dout(dc::notice, "Cropped (raw) width changed from " << mFormattedRawWidth << " to " << w); + Dout(dc::snapshot, "Cropped (raw) width changed from " << mFormattedRawWidth << " to " << w); if (mFormattedRawHeight != h) - Dout(dc::notice, "Cropped (raw) height changed from " << mFormattedRawHeight << " to " << h); + Dout(dc::snapshot, "Cropped (raw) height changed from " << mFormattedRawHeight << " to " << h); if (mFormattedCropOffset != crop_offset) - Dout(dc::notice, "Crop offset changed from " << mFormattedCropOffset << " to " << crop_offset); + Dout(dc::snapshot, "Crop offset changed from " << mFormattedCropOffset << " to " << crop_offset); if (mFormattedCropVertically != crop_vertically) - Dout(dc::notice, "Crop direction changed from " << (mFormattedCropVertically ? "vertical" : "horizontal") << " to " << (crop_vertically ? "vertical" : "horizontal")); + Dout(dc::snapshot, "Crop direction changed from " << (mFormattedCropVertically ? "vertical" : "horizontal") << " to " << (crop_vertically ? "vertical" : "horizontal")); if (mFormattedSnapshotFormat != format) - Dout(dc::notice, "Format changed from " << mFormattedSnapshotFormat << " to " << format); + Dout(dc::snapshot, "Format changed from " << mFormattedSnapshotFormat << " to " << format); if (!(mFormattedSnapshotQuality == mSnapshotQuality || format != LLFloaterSnapshot::SNAPSHOT_FORMAT_JPEG)) - Dout(dc::notice, "Format is JPEG and quality changed from " << mFormattedSnapshotQuality << " to " << mSnapshotQuality); + Dout(dc::snapshot, "Format is JPEG and quality changed from " << mFormattedSnapshotQuality << " to " << mSnapshotQuality); } #endif if (delayed) { // Just set mFormattedUpToDate. - Dout(dc::notice, "NOT up to date, but delayed. Returning."); + Dout(dc::snapshot, "NOT up to date, but delayed. Returning."); return DELAYED; } if (!mRawSnapshot) { - Dout(dc::notice, "No raw snapshot exists."); + Dout(dc::snapshot, "No raw snapshot exists."); return NO_RAW_IMAGE; } - Dout(dc::notice, "Generating a new formatted image!"); + Dout(dc::snapshot, "Generating a new formatted image!"); mFormattedWidth = mWidth; mFormattedHeight = mHeight; @@ -1313,7 +1313,7 @@ LLFloaterFeed* LLSnapshotLivePreview::getCaptionAndSaveFeed() ++mOutstandingCallbacks; mSaveFailures = 0; addUsedBy(SNAPSHOT_FEED); - Dout(dc::notice, "LLSnapshotLivePreview::getCaptionAndSaveFeed: sSnapshotIndex = " << sSnapshotIndex << "; mOutstandingCallbacks = " << mOutstandingCallbacks << "."); + Dout(dc::snapshot, "LLSnapshotLivePreview::getCaptionAndSaveFeed: sSnapshotIndex = " << sSnapshotIndex << "; mOutstandingCallbacks = " << mOutstandingCallbacks << "."); if (mFullScreenPreviewTexture.isNull()) { @@ -1351,7 +1351,7 @@ LLFloaterPostcard* LLSnapshotLivePreview::savePostcard() ++mOutstandingCallbacks; mSaveFailures = 0; addUsedBy(SNAPSHOT_POSTCARD); - Dout(dc::notice, "LLSnapshotLivePreview::savePostcard: sSnapshotIndex = " << sSnapshotIndex << "; mOutstandingCallbacks = " << mOutstandingCallbacks << "."); + Dout(dc::snapshot, "LLSnapshotLivePreview::savePostcard: sSnapshotIndex = " << sSnapshotIndex << "; mOutstandingCallbacks = " << mOutstandingCallbacks << "."); if(mFullScreenPreviewTexture.isNull()) { @@ -1397,7 +1397,7 @@ void LLSnapshotLivePreview::saveTexture() ++mOutstandingCallbacks; mSaveFailures = 0; addUsedBy(SNAPSHOT_TEXTURE); - Dout(dc::notice, "LLSnapshotLivePreview::saveTexture: sSnapshotIndex = " << sSnapshotIndex << "; mOutstandingCallbacks = " << mOutstandingCallbacks << "."); + Dout(dc::snapshot, "LLSnapshotLivePreview::saveTexture: sSnapshotIndex = " << sSnapshotIndex << "; mOutstandingCallbacks = " << mOutstandingCallbacks << "."); saveStart(sSnapshotIndex); // gen a new uuid for this asset @@ -1438,7 +1438,7 @@ void LLSnapshotLivePreview::saveLocal() ++mOutstandingCallbacks; mSaveFailures = 0; addUsedBy(SNAPSHOT_LOCAL); - Dout(dc::notice, "LLSnapshotLivePreview::saveLocal: sSnapshotIndex = " << sSnapshotIndex << "; mOutstandingCallbacks = " << mOutstandingCallbacks << "."); + Dout(dc::snapshot, "LLSnapshotLivePreview::saveLocal: sSnapshotIndex = " << sSnapshotIndex << "; mOutstandingCallbacks = " << mOutstandingCallbacks << "."); saveStart(sSnapshotIndex); gViewerWindow->saveImageNumbered(mFormattedImage, sSnapshotIndex); // This calls saveDone() immediately, or later. @@ -1446,7 +1446,7 @@ void LLSnapshotLivePreview::saveLocal() void LLSnapshotLivePreview::close(LLFloaterSnapshot* view) { - DoutEntering(dc::notice, "LLSnapshotLivePreview::close(" << (void*)view << ") [mOutstandingCallbacks = " << mOutstandingCallbacks << "]"); + DoutEntering(dc::snapshot, "LLSnapshotLivePreview::close(" << (void*)view << ") [mOutstandingCallbacks = " << mOutstandingCallbacks << "]"); mCloseCalled = view; if (!mOutstandingCallbacks) { @@ -1479,11 +1479,11 @@ void LLSnapshotLivePreview::saveStart(int index) void LLSnapshotLivePreview::saveDone(ESnapshotType type, bool success, int index) { - DoutEntering(dc::notice, "LLSnapshotLivePreview::saveDone(" << type << ", " << success << ", " << index << ")"); + DoutEntering(dc::snapshot, "LLSnapshotLivePreview::saveDone(" << type << ", " << success << ", " << index << ")"); if (sSnapshotIndex != index) { - Dout(dc::notice, "sSnapshotIndex (" << sSnapshotIndex << ") != index (" << index << ")"); + Dout(dc::snapshot, "sSnapshotIndex (" << sSnapshotIndex << ") != index (" << index << ")"); // The snapshot was already replaced, so this callback has nothing to do with us anymore. if (!success) @@ -1494,7 +1494,7 @@ void LLSnapshotLivePreview::saveDone(ESnapshotType type, bool success, int index } --mOutstandingCallbacks; - Dout(dc::notice, "sSnapshotIndex = " << sSnapshotIndex << "; mOutstandingCallbacks = " << mOutstandingCallbacks << "."); + Dout(dc::snapshot, "sSnapshotIndex = " << sSnapshotIndex << "; mOutstandingCallbacks = " << mOutstandingCallbacks << "."); if (!success) { ++mSaveFailures; @@ -1717,7 +1717,7 @@ void LLFloaterSnapshot::Impl::freezeTime(bool on) // static void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater, bool delayed_formatted) { - DoutEntering(dc::notice, "LLFloaterSnapshot::Impl::updateControls()"); + DoutEntering(dc::snapshot, "LLFloaterSnapshot::Impl::updateControls()"); std::string fee = gHippoGridManager->getConnectedGrid()->getUploadFee(); if (gSavedSettings.getBOOL("TemporaryUpload")) { @@ -2223,7 +2223,7 @@ void LLFloaterSnapshot::Impl::onCommitQuality(LLUICtrl* ctrl, void* data) //static void LLFloaterSnapshot::Impl::onQualityMouseUp(void* data) { - Dout(dc::notice, "Calling LLFloaterSnapshot::Impl::QualityMouseUp()"); + Dout(dc::snapshot, "Calling LLFloaterSnapshot::Impl::QualityMouseUp()"); LLFloaterSnapshot* view = (LLFloaterSnapshot *)data; updateControls(view); } diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 88b6286c7..beaddf7b1 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -4420,7 +4420,7 @@ bool LLViewerWindow::rawRawSnapshot(LLImageRaw *raw, // Center the buffer. buffer_x_offset = llfloor(((window_width - snapshot_width) * scale_factor) / 2.f); buffer_y_offset = llfloor(((window_height - snapshot_height) * scale_factor) / 2.f); - Dout(dc::notice, "rawSnapshot(" << image_width << ", " << image_height << ", " << snapshot_aspect << "): image_buffer_x = " << image_buffer_x << "; image_buffer_y = " << image_buffer_y); + Dout(dc::snapshot, "rawRawSnapshot(" << image_width << ", " << image_height << ", " << snapshot_aspect << "): image_buffer_x = " << image_buffer_x << "; image_buffer_y = " << image_buffer_y); bool error = !(image_buffer_x > 0 && image_buffer_y > 0); if (!error) From 9175bc0e165332f4525537eaf3c857350b1a5f1a Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Thu, 10 Jan 2013 18:11:45 +0100 Subject: [PATCH 02/19] Fixed LLUploadDialog to display it's text. Also made the view rectangle have some minimal size (1/10th of the screens width and height). Increased the used font a bit. Fixed removal of the dialog in the case of uploading to profile feed. --- indra/llui/llview.cpp | 2 +- indra/newview/llfloaterpostcard.cpp | 3 --- indra/newview/llfloatersnapshot.cpp | 3 +++ indra/newview/lluploaddialog.cpp | 13 ++++++++----- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index ae81cce24..07f99132b 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -1185,7 +1185,7 @@ void LLView::drawChildren() { // Only draw views that are within the root view LLRect screen_rect = viewp->calcScreenRect(); - if ( rootp->getLocalRect().overlaps(screen_rect) ) + if ( rootp->getRect().overlaps(screen_rect) ) { //gGL.matrixMode(LLRender::MM_MODELVIEW); LLUI::pushMatrix(); diff --git a/indra/newview/llfloaterpostcard.cpp b/indra/newview/llfloaterpostcard.cpp index 6c05f60a5..0a4663f2e 100644 --- a/indra/newview/llfloaterpostcard.cpp +++ b/indra/newview/llfloaterpostcard.cpp @@ -251,7 +251,6 @@ public: /*virtual*/ void uploadComplete(const LLSD& content) { // we don't care about what the server returns from this post, just clean up the UI - LLUploadDialog::modalUploadFinished(); LLFloaterSnapshot::savePostcardDone(true, mSnapshotIndex); } /*virtual*/ void uploadFailure(const LLSD& content) @@ -313,8 +312,6 @@ void LLFloaterPostcard::uploadCallback(const LLUUID& asset_id, void *user_data, { LLFloaterPostcard *self = (LLFloaterPostcard *)user_data; - LLUploadDialog::modalUploadFinished(); - LLFloaterSnapshot::savePostcardDone(!result, self->mSnapshotIndex); if (result) diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index dda174656..b25aa9383 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -73,6 +73,7 @@ #include "llworld.h" #include "llagentui.h" #include "llvoavatar.h" +#include "lluploaddialog.h" #include "llgl.h" #include "llglheaders.h" @@ -2018,6 +2019,7 @@ void LLFloaterSnapshot::saveLocalDone(bool success, int index) //static void LLFloaterSnapshot::saveFeedDone(bool success, int index) { + LLUploadDialog::modalUploadFinished(); LLSnapshotLivePreview* previewp = LLFloaterSnapshot::Impl::getPreviewView(); if (previewp) { @@ -2028,6 +2030,7 @@ void LLFloaterSnapshot::saveFeedDone(bool success, int index) //static void LLFloaterSnapshot::savePostcardDone(bool success, int index) { + LLUploadDialog::modalUploadFinished(); LLSnapshotLivePreview* previewp = LLFloaterSnapshot::Impl::getPreviewView(); if (previewp) { diff --git a/indra/newview/lluploaddialog.cpp b/indra/newview/lluploaddialog.cpp index a860e5303..a4f758ff8 100644 --- a/indra/newview/lluploaddialog.cpp +++ b/indra/newview/lluploaddialog.cpp @@ -75,7 +75,7 @@ LLUploadDialog::LLUploadDialog( const std::string& msg) } LLUploadDialog::sDialog = this; - const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ); + const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_BIG ); LLRect msg_rect; for (int line_num=0; line_num<16; ++line_num) { @@ -91,7 +91,10 @@ LLUploadDialog::LLUploadDialog( const std::string& msg) void LLUploadDialog::setMessage( const std::string& msg) { - const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ); + S32 const min_width = gViewerWindow->getWindowWidthRaw() / 10; + S32 const min_height = gViewerWindow->getWindowHeightRaw() / 10; + + const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_BIG ); const S32 VPAD = 16; const S32 HPAD = 25; @@ -127,14 +130,14 @@ void LLUploadDialog::setMessage( const std::string& msg) S32 line_height = S32( font->getLineHeight() + 0.99f ); - S32 dialog_width = max_msg_width + 2 * HPAD; - S32 dialog_height = line_height * msg_lines.size() + 2 * VPAD; + S32 dialog_width = llmax(max_msg_width + 2 * HPAD, min_width); + S32 dialog_height = llmax(line_height * (S32)msg_lines.size() + 2 * VPAD, min_height); reshape( dialog_width, dialog_height, FALSE ); // Message S32 msg_x = (getRect().getWidth() - max_msg_width) / 2; - S32 msg_y = getRect().getHeight() - VPAD - line_height; + S32 msg_y = (getRect().getHeight() + line_height * msg_lines.size()) / 2 - line_height; int line_num; for (line_num=0; line_num<16; ++line_num) { From 5daf817e7ecc170d36e21d171cca344d38872895 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Thu, 10 Jan 2013 19:42:19 +0100 Subject: [PATCH 03/19] Upload larger original to profile feed. --- indra/newview/llfloatersnapshot.cpp | 11 ++++++++++- .../skins/default/xui/en-us/floater_snapshot.xml | 12 ++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index b25aa9383..512c8eb38 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -1624,7 +1624,7 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp) S32 delta_height = 0; if (!gSavedSettings.getBOOL("AdvanceSnapshot")) { - floaterp->getChild("feed_size_combo")->setCurrentByIndex(2); // 500x375 + floaterp->getChild("feed_size_combo")->setCurrentByIndex(2); // 500x375 (4:3) gSavedSettings.setS32("SnapshotFeedLastResolution", 2); floaterp->getChild("postcard_size_combo")->setCurrentByIndex(0); // Current window @@ -2505,6 +2505,15 @@ void LLFloaterSnapshot::Impl::updateResolution(LLUICtrl* ctrl, void* data, bool previewp->setSize(gSavedSettings.getS32(lastSnapshotWidthName()), gSavedSettings.getS32(lastSnapshotHeightName())); } } + else if (height == -2) + { + // The size is actually the source aspect now, encoded in the width. + F32 source_aspect = width / 630.f; + // Use the size of the current window, cropped to the required aspect. + width = llmin(gViewerWindow->getWindowDisplayWidth(), llround(gViewerWindow->getWindowDisplayHeight() * source_aspect)); + height = llmin(gViewerWindow->getWindowDisplayHeight(), llround(gViewerWindow->getWindowDisplayWidth() / source_aspect)); + previewp->setSize(width, height); + } else { // use the resolution from the selected pre-canned drop-down choice diff --git a/indra/newview/skins/default/xui/en-us/floater_snapshot.xml b/indra/newview/skins/default/xui/en-us/floater_snapshot.xml index 5045c0c80..8142c0f2b 100644 --- a/indra/newview/skins/default/xui/en-us/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en-us/floater_snapshot.xml @@ -69,22 +69,22 @@ Current Window - + 500x500 (1:1) - + 500x375 (4:3) - + 500x350 (10:7) - + 500x313 (16:10) - + 500x281 (16:9) - + 500x250 (2:1) From 741a160913334faa9d2aa5ff853ea4c1a2d08132 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Fri, 11 Jan 2013 01:28:46 +0100 Subject: [PATCH 04/19] Fine tune of private (libcwd) assertion. It turns out that it's possible to receive data before an upload finished when the server sends HTTP_BAD_REQUEST in the middle of the upload (this happens to me when I try to upload a 6000x6000 image to my profile feed, with is a 44MB file). So, in that case the finished upload detection did not fail and we shouldn't assert. --- indra/llmessage/aicurl.cpp | 7 ++++++- indra/llmessage/aicurlprivate.h | 5 ++++- indra/llmessage/aicurlthread.cpp | 32 ++++++++++++++++++++++---------- 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/indra/llmessage/aicurl.cpp b/indra/llmessage/aicurl.cpp index cbb5fcc45..2bb76b5ab 100644 --- a/indra/llmessage/aicurl.cpp +++ b/indra/llmessage/aicurl.cpp @@ -1276,7 +1276,7 @@ static int const HTTP_REDIRECTS_DEFAULT = 10; LLChannelDescriptors const BufferedCurlEasyRequest::sChannels; -BufferedCurlEasyRequest::BufferedCurlEasyRequest() : mRequestTransferedBytes(0), mResponseTransferedBytes(0), mBufferEventsTarget(NULL) +BufferedCurlEasyRequest::BufferedCurlEasyRequest() : mRequestTransferedBytes(0), mResponseTransferedBytes(0), mBufferEventsTarget(NULL), mStatus(HTTP_INTERNAL_ERROR) { AICurlInterface::Stats::BufferedCurlEasyRequest_count++; } @@ -1336,8 +1336,13 @@ void BufferedCurlEasyRequest::resetState(void) // Call base class implementation. CurlEasyRequest::resetState(); + // Reset local variables. mOutput.reset(); mInput.reset(); + mRequestTransferedBytes = 0; + mResponseTransferedBytes = 0; + mBufferEventsTarget = NULL; + mStatus = HTTP_INTERNAL_ERROR; } void BufferedCurlEasyRequest::print_diagnostics(CURLcode code) diff --git a/indra/llmessage/aicurlprivate.h b/indra/llmessage/aicurlprivate.h index bd6207e2d..d9944ccb3 100644 --- a/indra/llmessage/aicurlprivate.h +++ b/indra/llmessage/aicurlprivate.h @@ -88,7 +88,7 @@ class HTTPTimeout : public LLRefCount { bool data_sent(size_t n); // Called when data is received. Returns true if transfer timed out. - bool data_received(size_t n); + bool data_received(size_t n/*,*/ ASSERT_ONLY_COMMA(bool upload_error_status = false)); // Called immediately before done() after curl finished, with code. void done(AICurlEasyRequest_wat const& curlEasyRequest_w, CURLcode code); @@ -498,6 +498,9 @@ class BufferedCurlEasyRequest : public CurlEasyRequest { // Return pointer to the ThreadSafe (wrapped) version of this object. ThreadSafeBufferedCurlEasyRequest* get_lockobj(void); ThreadSafeBufferedCurlEasyRequest const* get_lockobj(void) const; + // Return true when an error code was received that can occur before the upload finished. + // So far the only such error I've seen is HTTP_BAD_REQUEST. + bool upload_error_status(void) const { return mStatus == HTTP_BAD_REQUEST /*&& mStatus != HTTP_INTERNAL_ERROR*/; } // Return true when prepRequest was already called and the object has not been // invalidated as a result of calling timed_out(). diff --git a/indra/llmessage/aicurlthread.cpp b/indra/llmessage/aicurlthread.cpp index 6b67733bd..510789676 100644 --- a/indra/llmessage/aicurlthread.cpp +++ b/indra/llmessage/aicurlthread.cpp @@ -1871,7 +1871,13 @@ void HTTPTimeout::upload_finished(void) // queued--><--DNS lookup + connect + send headers-->[<--send body (if any)-->]<--replydelay--><--receive headers + body--><--done // ^ ^ ^ ^ ^ ^ ^ ^ // | | | | | | | | -bool HTTPTimeout::data_received(size_t n) +bool HTTPTimeout::data_received(size_t n/*,*/ +#ifdef CWDEBUG + ASSERT_ONLY_COMMA(bool upload_error_status) +#else + ASSERT_ONLY_COMMA(bool) +#endif + ) { // The HTTP header of the reply is the first thing we receive. if (mNothingReceivedYet && n > 0) @@ -1882,7 +1888,8 @@ bool HTTPTimeout::data_received(size_t n) // because in that case it is impossible to detect the difference between connecting and waiting for a reply without // using CURLOPT_DEBUGFUNCTION. Note that mDebugIsHeadOrGetMethod is only valid when the debug channel 'curlio' is on, // because it is set in the debug callback function. - Debug(llassert(AICurlEasyRequest_wat(*mLockObj)->mDebugIsHeadOrGetMethod || !dc::curlio.is_on())); + // This is also normal if we received a HTTP header with an error status, since that can interrupt our upload. + Debug(llassert(upload_error_status || AICurlEasyRequest_wat(*mLockObj)->mDebugIsHeadOrGetMethod || !dc::curlio.is_on())); // 'Upload finished' detection failed, generate it now. upload_finished(); } @@ -2395,23 +2402,18 @@ size_t BufferedCurlEasyRequest::curlHeaderCallback(char* data, size_t size, size char const* const header_line = static_cast(data); size_t const header_len = size * nmemb; - if (self_w->httptimeout()->data_received(header_len)) // Update timeout administration. - { - // Transfer timed out. Return 0 which will abort with error CURLE_WRITE_ERROR. - return 0; - } if (!header_len) { return header_len; } std::string header(header_line, header_len); + bool done = false; if (!LLStringUtil::_isASCII(header)) { - return header_len; + done = true; } - // Per HTTP spec the first header line must be the status line. - if (header.substr(0, 5) == "HTTP/") + else if (header.substr(0, 5) == "HTTP/") { std::string::iterator const begin = header.begin(); std::string::iterator const end = header.end(); @@ -2445,6 +2447,16 @@ size_t BufferedCurlEasyRequest::curlHeaderCallback(char* data, size_t size, size } self_w->received_HTTP_header(); self_w->setStatusAndReason(status, reason); + done = true; + } + // Update timeout administration. This must be done after the status is already known. + if (self_w->httptimeout()->data_received(header_len/*,*/ ASSERT_ONLY_COMMA(self_w->upload_error_status()))) + { + // Transfer timed out. Return 0 which will abort with error CURLE_WRITE_ERROR. + return 0; + } + if (done) + { return header_len; } From f9738cb61185689e1f9b26902d697fc8c7536423 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Fri, 11 Jan 2013 04:15:55 +0100 Subject: [PATCH 05/19] Add getName() to every non-base class Responder object. --- indra/llcrashlogger/llcrashlogger.cpp | 9 ++-- indra/llmessage/llavatarnamecache.cpp | 5 +- indra/llmessage/llhttpclient.cpp | 3 ++ indra/llmessage/llhttpclient.h | 4 ++ indra/llmessage/llsdmessage.h | 11 +++-- indra/llmessage/message.cpp | 7 +-- indra/newview/floatervoicelicense.cpp | 7 +-- indra/newview/importtracker.cpp | 12 +++-- indra/newview/lggdicdownload.cpp | 5 +- indra/newview/llaccountingcostmanager.cpp | 8 +-- indra/newview/llagent.cpp | 7 +-- indra/newview/llassetuploadqueue.cpp | 7 +-- indra/newview/llassetuploadresponders.h | 25 ++++++---- indra/newview/llclassifiedstatsresponder.h | 7 +-- indra/newview/lleventpoll.cpp | 7 +-- indra/newview/llfloateractivespeakers.cpp | 15 +++--- indra/newview/llfloateravatarpicker.cpp | 3 +- indra/newview/llfloaterpostcard.cpp | 1 + indra/newview/llfloaterregiondebugconsole.cpp | 18 +++---- indra/newview/llfloaterregioninfo.cpp | 7 +-- indra/newview/llfloaterreporter.cpp | 11 +++-- indra/newview/llfloaterteleport.cpp | 10 ++-- indra/newview/llfloatertos.cpp | 7 +-- indra/newview/llfloaterurlentry.cpp | 6 ++- indra/newview/llgroupmgr.cpp | 8 +-- indra/newview/llhomelocationresponder.h | 7 +-- indra/newview/llimpanel.cpp | 17 ++++--- indra/newview/llimview.cpp | 12 ++--- indra/newview/llinventorymodel.cpp | 7 +-- indra/newview/llinventorymodel.h | 7 +-- .../llinventorymodelbackgroundfetch.cpp | 16 +++--- indra/newview/llmapresponders.h | 5 +- indra/newview/llmarketplacefunctions.cpp | 14 +++--- indra/newview/llmeshrepository.cpp | 39 +++++++++------ indra/newview/llpanelgroupvoting.cpp | 15 +++--- indra/newview/llpanellogin.cpp | 4 +- indra/newview/llpathfindingmanager.cpp | 49 +++++++++++-------- indra/newview/llproductinforequest.cpp | 7 +-- indra/newview/llremoteparcelrequest.h | 7 +-- indra/newview/lltexturefetch.cpp | 14 +++--- indra/newview/lltranslate.h | 10 ++-- indra/newview/lluploadfloaterobservers.h | 9 ++-- indra/newview/llviewerdisplayname.cpp | 3 +- indra/newview/llviewermedia.cpp | 33 ++++++------- indra/newview/llviewermessage.cpp | 3 ++ indra/newview/llviewerobjectbackup.cpp | 4 +- indra/newview/llviewerobjectlist.cpp | 14 +++--- indra/newview/llviewerregion.cpp | 14 +++--- indra/newview/llviewerstats.cpp | 7 +-- indra/newview/llvoiceclient.cpp | 17 ++++--- indra/newview/llwebprofile.cpp | 7 ++- indra/newview/llwlhandlers.h | 16 +++--- indra/newview/llxmlrpcresponder.h | 1 + 53 files changed, 325 insertions(+), 243 deletions(-) diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp index 2537a4b87..7880271c3 100644 --- a/indra/llcrashlogger/llcrashlogger.cpp +++ b/indra/llcrashlogger/llcrashlogger.cpp @@ -60,22 +60,23 @@ extern AIHTTPTimeoutPolicy crashLoggerResponder_timeout; class LLCrashLoggerResponder : public LLHTTPClient::ResponderWithResult { public: - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return crashLoggerResponder_timeout; } - LLCrashLoggerResponder() { } - virtual void error(U32 status, const std::string& reason) + /*virtual*/ void error(U32 status, const std::string& reason) { gBreak = true; } - virtual void result(const LLSD& content) + /*virtual*/ void result(const LLSD& content) { gBreak = true; gSent = true; } + + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return crashLoggerResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLCrashLoggerResponder"; } }; bool LLCrashLoggerText::mainLoop() diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp index 48b6e4f63..36d691a5d 100644 --- a/indra/llmessage/llavatarnamecache.cpp +++ b/indra/llmessage/llavatarnamecache.cpp @@ -188,8 +188,6 @@ private: virtual bool needsHeaders(void) const { return true; } public: - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return avatarNameResponder_timeout; } - LLAvatarNameResponder(const std::vector& agent_ids) : mAgentIDs(agent_ids) { } @@ -271,6 +269,9 @@ public: LLAvatarNameCache::handleAgentError(agent_id); } } + + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return avatarNameResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLAvatarNameResponder"; } }; // Provide some fallback for agents that return errors diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp index 4021850a5..664b7ee10 100644 --- a/indra/llmessage/llhttpclient.cpp +++ b/indra/llmessage/llhttpclient.cpp @@ -533,16 +533,19 @@ protected: class BlockingLLSDPostResponder : public BlockingLLSDResponder { public: /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return blockingLLSDPost_timeout; } + /*virtual*/ char const* getName(void) const { return "BlockingLLSDPostResponder"; } }; class BlockingLLSDGetResponder : public BlockingLLSDResponder { public: /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return blockingLLSDGet_timeout; } + /*virtual*/ char const* getName(void) const { return "BlockingLLSDGetResponder"; } }; class BlockingRawGetResponder : public BlockingRawResponder { public: /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return blockingRawGet_timeout; } + /*virtual*/ char const* getName(void) const { return "BlockingRawGetResponder"; } }; // End (blocking) responders. diff --git a/indra/llmessage/llhttpclient.h b/indra/llmessage/llhttpclient.h index 934d5b137..d314f6215 100644 --- a/indra/llmessage/llhttpclient.h +++ b/indra/llmessage/llhttpclient.h @@ -196,6 +196,9 @@ public: // Timeout policy to use. virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const = 0; + // The name of the derived responder object. For debugging purposes. + virtual char const* getName(void) const = 0; + protected: // Derived classes can override this to get the HTML headers that were received, when the message is completed. // Only actually called for classes that implement a needsHeaders() that returns true. @@ -378,6 +381,7 @@ public: */ class ResponderIgnore : public ResponderIgnoreBody { /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return responderIgnore_timeout;} + /*virtual*/ char const* getName(void) const { return "ResponderIgnore"; } }; // A Responder is passed around as ResponderPtr, which causes it to automatically diff --git a/indra/llmessage/llsdmessage.h b/indra/llmessage/llsdmessage.h index 72b7dc675..6e7530ddb 100644 --- a/indra/llmessage/llsdmessage.h +++ b/indra/llmessage/llsdmessage.h @@ -136,8 +136,6 @@ private: class EventResponder: public LLHTTPClient::ResponderWithResult { public: - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return *mHTTPTimeoutPolicy; } - /** * LLHTTPClient::ResponderWithResult that dispatches via named LLEventPump instances. * We bind LLEventPumps, even though it's an LLSingleton, for testability. @@ -158,9 +156,12 @@ private: void setTimeoutPolicy(std::string const& name); - virtual void result(const LLSD& data); - virtual void errorWithContent(U32 status, const std::string& reason, const LLSD& content); - + /*virtual*/ void result(const LLSD& data); + /*virtual*/ void errorWithContent(U32 status, const std::string& reason, const LLSD& content); + + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return *mHTTPTimeoutPolicy; } + /*virtual*/ char const* getName(void) const { return "EventResponder"; } + private: LLEventPumps& mPumps; LLReqID mReqID; diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp index 1d51ff800..3f9c95dc8 100644 --- a/indra/llmessage/message.cpp +++ b/indra/llmessage/message.cpp @@ -118,7 +118,7 @@ namespace { } - virtual void error(U32 status, const std::string& reason) + /*virtual*/ void error(U32 status, const std::string& reason) { // don't spam when agent communication disconnected already if (status != 410) @@ -131,12 +131,13 @@ namespace if(NULL != mCallback) mCallback(mCallbackData, LL_ERR_TCP_TIMEOUT); } - virtual void result(const LLSD& content) + /*virtual*/ void result(const LLSD& content) { if(NULL != mCallback) mCallback(mCallbackData, LL_ERR_NOERR); } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return fnPtrResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return fnPtrResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLFnPtrResponder"; } private: diff --git a/indra/newview/floatervoicelicense.cpp b/indra/newview/floatervoicelicense.cpp index 322c4778e..17dff4a5e 100644 --- a/indra/newview/floatervoicelicense.cpp +++ b/indra/newview/floatervoicelicense.cpp @@ -85,13 +85,13 @@ class LLIamHereVoice : public LLHTTPClient::ResponderWithResult mParent = parentIn; }; - virtual void result( const LLSD& content ) + /*virtual*/ void result( const LLSD& content ) { if ( mParent ) mParent->setSiteIsAlive( true ); }; - virtual void error( U32 status, const std::string& reason ) + /*virtual*/ void error( U32 status, const std::string& reason ) { if ( mParent ) { @@ -103,7 +103,8 @@ class LLIamHereVoice : public LLHTTPClient::ResponderWithResult } }; - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return iamHereVoice_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return iamHereVoice_timeout; } + /*virtual*/ char const* getName(void) const { return "LLIamHereVoice"; } }; // this is global and not a class member to keep crud out of the header file diff --git a/indra/newview/importtracker.cpp b/indra/newview/importtracker.cpp index ce2e6bb1e..674ea6143 100644 --- a/indra/newview/importtracker.cpp +++ b/indra/newview/importtracker.cpp @@ -301,7 +301,9 @@ void ImportTracker::get_update(S32 newid, BOOL justCreated, BOOL createSelected) break;*/ } } -/*struct InventoryImportInfo + +#if 0 +struct InventoryImportInfo { U32 localid; LLAssetType::EType type; @@ -372,7 +374,7 @@ public: { } - virtual void uploadComplete(const LLSD& content) + /*virtual*/ void uploadComplete(const LLSD& content) { LLPointer cb = new JCImportTransferCallback(data); LLPermissions perm; @@ -385,6 +387,7 @@ public: cb); } + /*virtual*/ char const* getName(void) const { return "JCImportInventoryResponder"; } private: InventoryImportInfo* data; }; @@ -405,13 +408,14 @@ public: LLAssetType::EType asset_type) : LLAssetUploadResponder(post_data, file_name, asset_type) { } - virtual void uploadComplete(const LLSD& content) + /*virtual*/ void uploadComplete(const LLSD& content) { //cmdline_printchat("completed upload, inserting"); LLViewerInventoryItem* item = (LLViewerInventoryItem*)gInventory.getItem(item_id); LLViewerObject* objectp = find(data->localid); insert(item, objectp, data); } + /*virtual*/ char const* getName(void) const { return "JCPostInvUploadResponder"; } private: LLUUID item_id; InventoryImportInfo* data; @@ -1119,4 +1123,4 @@ void ImportTracker::plywood_above_head() msg->addUUIDFast(_PREHASH_RayTargetID, LLUUID::null); msg->sendReliable(region->getHost()); } -*/ +#endif diff --git a/indra/newview/lggdicdownload.cpp b/indra/newview/lggdicdownload.cpp index d4caa10ae..8207ed0bc 100644 --- a/indra/newview/lggdicdownload.cpp +++ b/indra/newview/lggdicdownload.cpp @@ -57,12 +57,13 @@ class EmeraldDicDownloader : public LLHTTPClient::ResponderWithCompleted public: EmeraldDicDownloader(lggDicDownloadFloater* spanel, std::string sname); ~EmeraldDicDownloader() { } - void completedRaw( + /*virtual*/ void completedRaw( U32 status, const std::string& reason, const LLChannelDescriptors& channels, const buffer_ptr_t& buffer); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return emeraldDicDownloader_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return emeraldDicDownloader_timeout; } + /*virtual*/ char const* getName(void) const { return "EmeraldDicDownloader"; } private: lggDicDownloadFloater* panel; std::string name; diff --git a/indra/newview/llaccountingcostmanager.cpp b/indra/newview/llaccountingcostmanager.cpp index a319e38d7..d4a5108c5 100644 --- a/indra/newview/llaccountingcostmanager.cpp +++ b/indra/newview/llaccountingcostmanager.cpp @@ -54,13 +54,13 @@ public: } } - void error( U32 statusNum, const std::string& reason ) + /*virtual*/ void error( U32 statusNum, const std::string& reason ) { llwarns << "Transport error "<get(); @@ -136,13 +136,14 @@ public: LLUpdateTaskInventoryResponder::uploadComplete(content); } + /*virtual*/ char const* getName(void) const { return "LLAssetUploadChainResponder"; } + LLAssetUploadQueueSupplier *mSupplier; char* mData; U32 mDataSize; std::string mScriptName; }; - LLAssetUploadQueue::LLAssetUploadQueue(LLAssetUploadQueueSupplier *supplier) : mSupplier(supplier) { diff --git a/indra/newview/llassetuploadresponders.h b/indra/newview/llassetuploadresponders.h index fa4e5a8eb..323ccf910 100644 --- a/indra/newview/llassetuploadresponders.h +++ b/indra/newview/llassetuploadresponders.h @@ -61,9 +61,10 @@ public: const std::string& file_name, LLAssetType::EType asset_type); ~LLAssetUploadResponder(); - virtual void error(U32 statusNum, const std::string& reason); - virtual void result(const LLSD& content); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return assetUploadResponder_timeout; } + /*virtual*/ void error(U32 statusNum, const std::string& reason); + /*virtual*/ void result(const LLSD& content); + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return assetUploadResponder_timeout; } + virtual void uploadUpload(const LLSD& content); virtual void uploadComplete(const LLSD& content); virtual void uploadFailure(const LLSD& content); @@ -86,9 +87,10 @@ public: const LLSD& post_data, const std::string& file_name, LLAssetType::EType asset_type); - virtual void error(U32 statusNum, const std::string& reason); + /*virtual*/ void error(U32 statusNum, const std::string& reason); virtual void uploadComplete(const LLSD& content); virtual void uploadFailure(const LLSD& content); + /*virtual*/ char const* getName(void) const { return "LLNewAgentInventoryResponder"; } }; // A base class which goes through and performs some default @@ -110,12 +112,12 @@ public: const LLSD& inventory_info); virtual ~LLNewAgentInventoryVariablePriceResponder(); - void errorWithContent( + /*virtual*/ void errorWithContent( U32 statusNum, const std::string& reason, const LLSD& content); - void result(const LLSD& content); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return newAgentInventoryVariablePriceResponder_timeout; } + /*virtual*/ void result(const LLSD& content); + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return newAgentInventoryVariablePriceResponder_timeout; } virtual void onApplicationLevelError( const LLSD& error); @@ -141,8 +143,9 @@ public: ~LLSendTexLayerResponder(); - virtual void uploadComplete(const LLSD& content); - virtual void error(U32 statusNum, const std::string& reason); + /*virtual*/ void uploadComplete(const LLSD& content); + /*virtual*/ void error(U32 statusNum, const std::string& reason); + /*virtual*/ char const* getName(void) const { return "LLSendTexLayerResponder"; } LLBakedUploadData * mBakedUploadData; }; @@ -157,6 +160,7 @@ public: const std::string& file_name, LLAssetType::EType asset_type); virtual void uploadComplete(const LLSD& content); + /*virtual*/ char const* getName(void) const { return "LLUpdateAgentInventoryResponder"; } }; class LLUpdateTaskInventoryResponder : public LLAssetUploadResponder @@ -174,7 +178,8 @@ public: LLAssetType::EType asset_type); virtual void uploadComplete(const LLSD& content); - + /*virtual*/ char const* getName(void) const { return "LLUpdateTaskInventoryResponder"; } + private: LLUUID mQueueId; }; diff --git a/indra/newview/llclassifiedstatsresponder.h b/indra/newview/llclassifiedstatsresponder.h index f317d5851..d44d43f78 100644 --- a/indra/newview/llclassifiedstatsresponder.h +++ b/indra/newview/llclassifiedstatsresponder.h @@ -45,10 +45,11 @@ class LLClassifiedStatsResponder : public LLHTTPClient::ResponderWithResult public: LLClassifiedStatsResponder(LLHandle classified_panel_handle, LLUUID classified_id); //If we get back a normal response, handle it here - virtual void result(const LLSD& content); + /*virtual*/ void result(const LLSD& content); //If we get back an error (not found, etc...), handle it here - virtual void error(U32 status, const std::string& reason); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return classifiedStatsResponder_timeout; } + /*virtual*/ void error(U32 status, const std::string& reason); + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return classifiedStatsResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLClassifiedStatsResponder"; } protected: LLHandle mClassifiedPanelHandle; diff --git a/indra/newview/lleventpoll.cpp b/indra/newview/lleventpoll.cpp index 6548d520b..3efc942da 100644 --- a/indra/newview/lleventpoll.cpp +++ b/indra/newview/lleventpoll.cpp @@ -73,9 +73,10 @@ namespace void handleMessage(const LLSD& content); - virtual void error(U32 status, const std::string& reason); - virtual void result(const LLSD& content); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return eventPollResponder_timeout; } + /*virtual*/ void error(U32 status, const std::string& reason); + /*virtual*/ void result(const LLSD& content); + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return eventPollResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLEventPollResponder"; } private: diff --git a/indra/newview/llfloateractivespeakers.cpp b/indra/newview/llfloateractivespeakers.cpp index 5eb9afa32..26cdb0752 100644 --- a/indra/newview/llfloateractivespeakers.cpp +++ b/indra/newview/llfloateractivespeakers.cpp @@ -832,7 +832,7 @@ void LLPanelActiveSpeakers::onModeratorMuteVoice(LLUICtrl* ctrl, void* user_data mSessionID = session_id; } - virtual void error(U32 status, const std::string& reason) + /*virtual*/ void error(U32 status, const std::string& reason) { llwarns << status << ": " << reason << llendl; @@ -862,7 +862,8 @@ void LLPanelActiveSpeakers::onModeratorMuteVoice(LLUICtrl* ctrl, void* user_data } } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return muteVoiceResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return muteVoiceResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "MuteVoiceResponder"; } private: LLUUID mSessionID; @@ -899,7 +900,7 @@ void LLPanelActiveSpeakers::onModeratorMuteText(LLUICtrl* ctrl, void* user_data) mSessionID = session_id; } - virtual void error(U32 status, const std::string& reason) + /*virtual*/ void error(U32 status, const std::string& reason) { llwarns << status << ": " << reason << llendl; @@ -929,7 +930,8 @@ void LLPanelActiveSpeakers::onModeratorMuteText(LLUICtrl* ctrl, void* user_data) } } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return muteTextResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return muteTextResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "MuteTextResponder"; } private: LLUUID mSessionID; @@ -967,11 +969,12 @@ void LLPanelActiveSpeakers::onChangeModerationMode(LLUICtrl* ctrl, void* user_da struct ModerationModeResponder : public LLHTTPClient::ResponderIgnoreBody { - virtual void error(U32 status, const std::string& reason) + /*virtual*/ void error(U32 status, const std::string& reason) { llwarns << status << ": " << reason << llendl; } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return moderationModeResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return moderationModeResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "ModerationModeResponder"; } }; LLHTTPClient::post(url, data, new ModerationModeResponder()); diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp index dc0ad358c..f0593517f 100644 --- a/indra/newview/llfloateravatarpicker.cpp +++ b/indra/newview/llfloateravatarpicker.cpp @@ -487,7 +487,8 @@ public: } } - const AIHTTPTimeoutPolicy &getHTTPTimeoutPolicy(void) const { return avatarPickerResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return avatarPickerResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLAvatarPickerResponder"; } }; void LLFloaterAvatarPicker::find() diff --git a/indra/newview/llfloaterpostcard.cpp b/indra/newview/llfloaterpostcard.cpp index 0a4663f2e..31019099f 100644 --- a/indra/newview/llfloaterpostcard.cpp +++ b/indra/newview/llfloaterpostcard.cpp @@ -263,6 +263,7 @@ public: LLAssetUploadResponder::error(statusNum, reason); LLFloaterSnapshot::savePostcardDone(false, mSnapshotIndex); } + /*virtual*/ char const* getName(void) const { return "LLSendPostcardResponder"; } }; // static diff --git a/indra/newview/llfloaterregiondebugconsole.cpp b/indra/newview/llfloaterregiondebugconsole.cpp index a17eeab1e..f19392fab 100644 --- a/indra/newview/llfloaterregiondebugconsole.cpp +++ b/indra/newview/llfloaterregiondebugconsole.cpp @@ -80,12 +80,9 @@ namespace class AsyncConsoleResponder : public LLHTTPClient::ResponderIgnoreBody { public: - /* virtual */ - void error(U32 status, const std::string& reason) - { - sConsoleReplySignal(UNABLE_TO_SEND_COMMAND); - } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return asyncConsoleResponder_timeout; } + /*virtual*/ void error(U32 status, const std::string& reason) { sConsoleReplySignal(UNABLE_TO_SEND_COMMAND); } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return asyncConsoleResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "AsyncConsoleResponder"; } }; class ConsoleResponder : public LLHTTPClient::ResponderWithResult @@ -95,8 +92,7 @@ namespace { } - /*virtual*/ - void error(U32 status, const std::string& reason) + /*virtual*/ void error(U32 status, const std::string& reason) { if (mOutput) { @@ -106,8 +102,7 @@ namespace } } - /*virtual*/ - void result(const LLSD& content) + /*virtual*/ void result(const LLSD& content) { if (mOutput) { @@ -116,7 +111,8 @@ namespace } } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return consoleResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return consoleResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "ConsoleResponder"; } LLTextEditor * mOutput; }; diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index bc6dbbde0..2265d6671 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -2326,7 +2326,7 @@ public: } // if we get a normal response, handle it here - virtual void result(const LLSD& content) + /*virtual*/ void result(const LLSD& content) { LL_INFOS("Windlight") << "Successfully committed estate info" << llendl; @@ -2337,13 +2337,14 @@ public: } // if we get an error response - virtual void error(U32 status, const std::string& reason) + /*virtual*/ void error(U32 status, const std::string& reason) { llinfos << "LLEstateChangeInfoResponder::error " << status << ": " << reason << llendl; } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return estateChangeInfoResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return estateChangeInfoResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLEstateChangeInfoResponder"; } private: LLHandle mpPanel; diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp index db29806ac..03c5bc20f 100644 --- a/indra/newview/llfloaterreporter.cpp +++ b/indra/newview/llfloaterreporter.cpp @@ -843,7 +843,7 @@ public: LLUserReportScreenshotResponder(const LLSD & post_data, const LLUUID & vfile_id, LLAssetType::EType asset_type): - LLAssetUploadResponder(post_data, vfile_id, asset_type) + LLAssetUploadResponder(post_data, vfile_id, asset_type) { } void uploadFailed(const LLSD& content) @@ -856,6 +856,8 @@ public: // we don't care about what the server returns from this post, just clean up the UI LLUploadDialog::modalUploadFinished(); } + + /*virtual*/ char const* getName(void) const { return "LLUserReportScreenshotResponder"; } }; class LLUserReportResponder : public LLHTTPClient::ResponderWithResult @@ -863,17 +865,18 @@ class LLUserReportResponder : public LLHTTPClient::ResponderWithResult public: LLUserReportResponder() { } - void error(U32 status, const std::string& reason) + /*virtual*/ void error(U32 status, const std::string& reason) { // *TODO do some user messaging here LLUploadDialog::modalUploadFinished(); } - void result(const LLSD& content) + /*virtual*/ void result(const LLSD& content) { // we don't care about what the server returns LLUploadDialog::modalUploadFinished(); } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return userReportResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return userReportResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLUserReportResponder"; } }; void LLFloaterReporter::sendReportViaCaps(std::string url, std::string sshot_url, const LLSD& report) diff --git a/indra/newview/llfloaterteleport.cpp b/indra/newview/llfloaterteleport.cpp index 04ca6d499..dd546c5b0 100644 --- a/indra/newview/llfloaterteleport.cpp +++ b/indra/newview/llfloaterteleport.cpp @@ -63,8 +63,7 @@ extern AIHTTPTimeoutPolicy placeAvatarTeleportResponder_timeout; // OGPX TODO: should this be combined with the Login responder for rez_avatar/place? // OGPX TODO: mResult should not get replaced in result(), instead // should replace individual LLSD fields in mResult. -class LLPlaceAvatarTeleportResponder : - public LLHTTPClient::ResponderWithResult +class LLPlaceAvatarTeleportResponder : public LLHTTPClient::ResponderWithResult { public: LLPlaceAvatarTeleportResponder() @@ -75,7 +74,7 @@ public: { } - void error(U32 statusNum, const std::string& reason) + /*virtual*/ void error(U32 statusNum, const std::string& reason) { LL_INFOS("OGPX") << "LLPlaceAvatarTeleportResponder error in TP " << statusNum << " " << reason << LL_ENDL; @@ -90,7 +89,7 @@ public: } - void result(const LLSD& content) + /*virtual*/ void result(const LLSD& content) { LLSD result; @@ -221,7 +220,8 @@ public: } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return placeAvatarTeleportResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return placeAvatarTeleportResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLPlaceAvatarTeleportResponder"; } }; // Statics diff --git a/indra/newview/llfloatertos.cpp b/indra/newview/llfloatertos.cpp index e5237e8f2..e58b1783e 100644 --- a/indra/newview/llfloatertos.cpp +++ b/indra/newview/llfloatertos.cpp @@ -113,13 +113,13 @@ class LLIamHere : public LLHTTPClient::ResponderWithResult mParent = parentIn; }; - virtual void result( const LLSD& content ) + /*virtual*/ void result( const LLSD& content ) { if ( mParent ) mParent->setSiteIsAlive( true ); }; - virtual void error( U32 status, const std::string& reason ) + /*virtual*/ void error( U32 status, const std::string& reason ) { if ( mParent ) { @@ -131,7 +131,8 @@ class LLIamHere : public LLHTTPClient::ResponderWithResult } }; - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return iamHere_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return iamHere_timeout; } + /*virtual*/ char const* getName(void) const { return "LLIamHere"; } }; // this is global and not a class member to keep crud out of the header file diff --git a/indra/newview/llfloaterurlentry.cpp b/indra/newview/llfloaterurlentry.cpp index 60d6ad963..122cfd60f 100644 --- a/indra/newview/llfloaterurlentry.cpp +++ b/indra/newview/llfloaterurlentry.cpp @@ -62,7 +62,7 @@ public: LLHandle mParent; - virtual void completedHeaders(U32 status, std::string const& reason, AIHTTPReceivedHeaders const& headers) + /*virtual*/ void completedHeaders(U32 status, std::string const& reason, AIHTTPReceivedHeaders const& headers) { if (200 <= status && status < 300) { @@ -89,7 +89,9 @@ public: floater_url_entry->headerFetchComplete( status, resolved_mime_type ); } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return mediaTypeResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return mediaTypeResponder_timeout; } + + /*virtual*/ char const* getName(void) const { return "LLMediaTypeResponder"; } }; //----------------------------------------------------------------------------- diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp index 3cde11774..ea0014b1b 100644 --- a/indra/newview/llgroupmgr.cpp +++ b/indra/newview/llgroupmgr.cpp @@ -1896,12 +1896,12 @@ extern AIHTTPTimeoutPolicy groupMemberDataResponder_timeout; class GroupMemberDataResponder : public LLHTTPClient::ResponderWithResult { public: - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return groupMemberDataResponder_timeout; } - GroupMemberDataResponder() {} virtual ~GroupMemberDataResponder() {} - virtual void result(const LLSD& pContent); - virtual void error(U32 pStatus, const std::string& pReason); + /*virtual*/ void result(const LLSD& pContent); + /*virtual*/ void error(U32 pStatus, const std::string& pReason); + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return groupMemberDataResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "GroupMemberDataResponder"; } private: LLSD mMemberData; }; diff --git a/indra/newview/llhomelocationresponder.h b/indra/newview/llhomelocationresponder.h index c9d098740..9ffffc304 100644 --- a/indra/newview/llhomelocationresponder.h +++ b/indra/newview/llhomelocationresponder.h @@ -44,9 +44,10 @@ extern AIHTTPTimeoutPolicy homeLocationResponder_timeout; /* Typedef, Enum, Class, Struct, etc. */ class LLHomeLocationResponder : public LLHTTPClient::ResponderWithResult { - virtual void result( const LLSD& content ); - virtual void error( U32 status, const std::string& reason ); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return homeLocationResponder_timeout; } + /*virtual*/ void result( const LLSD& content ); + /*virtual*/ void error( U32 status, const std::string& reason ); + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return homeLocationResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLHomeLocationResponder"; } }; #endif diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index 2cbe64c02..2c6b4dea6 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -199,7 +199,7 @@ public: mAgents = agents_to_invite; } - virtual void error(U32 statusNum, const std::string& reason) + /*virtual*/ void error(U32 statusNum, const std::string& reason) { //try an "old school" way. if ( statusNum == 400 ) @@ -219,7 +219,8 @@ public: //the possible different language translations } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return startConferenceChatResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return startConferenceChatResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLStartConferenceChatResponder"; } private: LLUUID mTempSessionID; @@ -306,9 +307,10 @@ class LLVoiceCallCapResponder : public LLHTTPClient::ResponderWithResult public: LLVoiceCallCapResponder(const LLUUID& session_id) : mSessionID(session_id) {}; - virtual void error(U32 status, const std::string& reason); // called with bad status codes - virtual void result(const LLSD& content); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return voiceCallCapResponder_timeout; } + /*virtual*/ void error(U32 status, const std::string& reason); // called with bad status codes + /*virtual*/ void result(const LLSD& content); + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return voiceCallCapResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLVoiceCallCapResponder"; } private: LLUUID mSessionID; @@ -1562,13 +1564,14 @@ public: mSessionID = session_id; } - void error(U32 statusNum, const std::string& reason) + /*virtual*/ void error(U32 statusNum, const std::string& reason) { llinfos << "Error inviting all agents to session" << llendl; //throw something back to the viewer here? } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return sessionInviteResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return sessionInviteResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLSessionInviteResponder"; } private: LLUUID mSessionID; diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 92f5cd320..a5740dac2 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -94,8 +94,7 @@ LLIMMgr* gIMMgr = NULL; //{ // return (LLStringUtil::compareDict( a->mName, b->mName ) < 0); //} -class LLViewerChatterBoxInvitationAcceptResponder : - public LLHTTPClient::ResponderWithResult +class LLViewerChatterBoxInvitationAcceptResponder : public LLHTTPClient::ResponderWithResult { public: LLViewerChatterBoxInvitationAcceptResponder( @@ -106,7 +105,7 @@ public: mInvitiationType = invitation_type; } - void result(const LLSD& content) + /*virtual*/ void result(const LLSD& content) { if ( gIMMgr) { @@ -154,8 +153,8 @@ public: } } - void error(U32 statusNum, const std::string& reason) - { + /*virtual*/ void error(U32 statusNum, const std::string& reason) + { //throw something back to the viewer here? if ( gIMMgr ) { @@ -177,7 +176,8 @@ public: } } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return viewerChatterBoxInvitationAcceptResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return viewerChatterBoxInvitationAcceptResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLViewerChatterBoxInvitationAcceptResponder"; } private: LLUUID mSessionID; diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index cacdc559a..4764a47b1 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -483,12 +483,12 @@ public: { } - virtual void error(U32 status, const std::string& reason) + /*virtual*/ void error(U32 status, const std::string& reason) { LL_WARNS("InvAPI") << "CreateInventoryCategory failed. status = " << status << ", reasion = \"" << reason << "\"" << LL_ENDL; } - virtual void result(const LLSD& content) + /*virtual*/ void result(const LLSD& content) { //Server has created folder. @@ -515,7 +515,8 @@ public: } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return createInventoryCategoryResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return createInventoryCategoryResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLCreateInventoryCategoryResponder"; } private: void (*mCallback)(const LLSD&, void*); diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h index b22efb9eb..3f87c2615 100644 --- a/indra/newview/llinventorymodel.h +++ b/indra/newview/llinventorymodel.h @@ -87,9 +87,10 @@ public: { public: fetchInventoryResponder(const LLSD& request_sd) : mRequestSD(request_sd) {}; - void result(const LLSD& content); - void error(U32 status, const std::string& reason); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return fetchInventoryResponder_timeout; } + /*virtual*/ void result(const LLSD& content); + /*virtual*/ void error(U32 status, const std::string& reason); + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return fetchInventoryResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "fetchInventoryResponder"; } protected: LLSD mRequestSD; }; diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp index d1ed71e8b..eeec545c9 100644 --- a/indra/newview/llinventorymodelbackgroundfetch.cpp +++ b/indra/newview/llinventorymodelbackgroundfetch.cpp @@ -376,9 +376,10 @@ class LLInventoryModelFetchItemResponder : public LLInventoryModel::fetchInvento { public: LLInventoryModelFetchItemResponder(const LLSD& request_sd) : LLInventoryModel::fetchInventoryResponder(request_sd) {}; - void result(const LLSD& content); - void error(U32 status, const std::string& reason); - AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return inventoryModelFetchItemResponder_timeout; } + /*virtual*/ void result(const LLSD& content); + /*virtual*/ void error(U32 status, const std::string& reason); + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return inventoryModelFetchItemResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLInventoryModelFetchItemResponder"; } }; void LLInventoryModelFetchItemResponder::result( const LLSD& content ) @@ -393,7 +394,7 @@ void LLInventoryModelFetchItemResponder::error( U32 status, const std::string& r LLInventoryModelBackgroundFetch::instance().incrFetchCount(-1); } -class LLInventoryModelFetchDescendentsResponder: public LLHTTPClient::ResponderWithResult +class LLInventoryModelFetchDescendentsResponder : public LLHTTPClient::ResponderWithResult { public: LLInventoryModelFetchDescendentsResponder(const LLSD& request_sd, uuid_vec_t recursive_cats) : @@ -401,9 +402,10 @@ class LLInventoryModelFetchDescendentsResponder: public LLHTTPClient::ResponderW mRecursiveCatUUIDs(recursive_cats) {}; //LLInventoryModelFetchDescendentsResponder() {}; - void result(const LLSD& content); - void error(U32 status, const std::string& reason); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return inventoryModelFetchDescendentsResponder_timeout; } + /*virtual*/ void result(const LLSD& content); + /*virtual*/ void error(U32 status, const std::string& reason); + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return inventoryModelFetchDescendentsResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLInventoryModelFetchDescendentsResponder"; } protected: BOOL getIsRecursive(const LLUUID& cat_id) const; diff --git a/indra/newview/llmapresponders.h b/indra/newview/llmapresponders.h index 8b287c9fb..835722348 100644 --- a/indra/newview/llmapresponders.h +++ b/indra/newview/llmapresponders.h @@ -40,8 +40,9 @@ extern AIHTTPTimeoutPolicy mapLayerResponder_timeout; class LLMapLayerResponder : public LLHTTPClient::ResponderWithResult { - virtual void result(const LLSD& content); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return mapLayerResponder_timeout; } + /*virtual*/ void result(const LLSD& content); + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return mapLayerResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLMapLayerResponder"; } }; #endif // LL_LLMAPLAYERRESPONDER_H diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp index f9da070e2..0b19efde6 100644 --- a/indra/newview/llmarketplacefunctions.cpp +++ b/indra/newview/llmarketplacefunctions.cpp @@ -157,9 +157,7 @@ namespace LLMarketplaceImport class LLImportPostResponder : public LLHTTPClient::ResponderWithCompleted { public: - AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return MPImportPostResponder_timeout; } - - void completed(U32 status, const std::string& reason, const LLSD& content) + /*virtual*/ void completed(U32 status, const std::string& reason, const LLSD& content) { slmPostTimer.stop(); @@ -189,13 +187,14 @@ namespace LLMarketplaceImport sImportResultStatus = status; sImportId = content; } + + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return MPImportPostResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLImportPostResponder"; } }; class LLImportGetResponder : public LLHTTPClient::ResponderWithCompleted { public: - AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return MPImportGetResponder_timeout; } - /*virtual*/ bool followRedir(void) const { return true; } /*virtual*/ bool needsHeaders(void) const { return true; } @@ -215,7 +214,7 @@ namespace LLMarketplaceImport } } - void completed(U32 status, const std::string& reason, const LLSD& content) + /*virtual*/ void completed(U32 status, const std::string& reason, const LLSD& content) { slmGetTimer.stop(); @@ -244,6 +243,9 @@ namespace LLMarketplaceImport sImportResultStatus = status; sImportResults = content; } + + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return MPImportGetResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLImportGetResponder"; } }; // Basic API diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 74f090532..260c3cc87 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -226,11 +226,12 @@ public: LLMeshRepoThread::sActiveHeaderRequests--; } - virtual void completedRaw(U32 status, const std::string& reason, + /*virtual*/ void completedRaw(U32 status, const std::string& reason, const LLChannelDescriptors& channels, const LLIOPipe::buffer_ptr_t& buffer); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return meshHeaderResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return meshHeaderResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLMeshHeaderResponder"; } }; class LLMeshLODResponder : public LLHTTPClient::ResponderWithCompleted @@ -252,11 +253,12 @@ public: LLMeshRepoThread::sActiveLODRequests--; } - virtual void completedRaw(U32 status, const std::string& reason, + /*virtual*/ void completedRaw(U32 status, const std::string& reason, const LLChannelDescriptors& channels, const LLIOPipe::buffer_ptr_t& buffer); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return meshLODResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return meshLODResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLMeshLODResponder"; } }; class LLMeshSkinInfoResponder : public LLHTTPClient::ResponderWithCompleted @@ -271,11 +273,12 @@ public: { } - virtual void completedRaw(U32 status, const std::string& reason, + /*virtual*/ void completedRaw(U32 status, const std::string& reason, const LLChannelDescriptors& channels, const LLIOPipe::buffer_ptr_t& buffer); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return meshSkinInfoResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return meshSkinInfoResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLMeshSkinInfoResponder"; } }; class LLMeshDecompositionResponder : public LLHTTPClient::ResponderWithCompleted @@ -290,11 +293,12 @@ public: { } - virtual void completedRaw(U32 status, const std::string& reason, + /*virtual*/ void completedRaw(U32 status, const std::string& reason, const LLChannelDescriptors& channels, const LLIOPipe::buffer_ptr_t& buffer); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return meshDecompositionResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return meshDecompositionResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLMeshDecompositionResponder"; } }; class LLMeshPhysicsShapeResponder : public LLHTTPClient::ResponderWithCompleted @@ -309,11 +313,12 @@ public: { } - virtual void completedRaw(U32 status, const std::string& reason, + /*virtual*/ void completedRaw(U32 status, const std::string& reason, const LLChannelDescriptors& channels, const LLIOPipe::buffer_ptr_t& buffer); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return meshPhysicsShapeResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return meshPhysicsShapeResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLMeshPhysicsShapeResponder"; } }; #if MESH_IMPORT @@ -366,7 +371,7 @@ void log_upload_error(S32 status, const LLSD& content, std::string stage, std::s } } -class LLWholeModelFeeResponder: public LLHTTPClient::ResponderWithCompleted +class LLWholeModelFeeResponder : public LLHTTPClient::ResponderWithCompleted { LLMeshUploadThread* mThread; LLSD mModelData; @@ -378,7 +383,7 @@ public: mObserverHandle(observer_handle) { } - virtual void completed(U32 status, + /*virtual*/ void completed(U32 status, const std::string& reason, const LLSD& content) { @@ -417,10 +422,11 @@ public: } } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return wholeModelFeeResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return wholeModelFeeResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLWholeModelFeeResponder"; } }; -class LLWholeModelUploadResponder: public LLHTTPClient::ResponderWithCompleted +class LLWholeModelUploadResponder : public LLHTTPClient::ResponderWithCompleted { LLMeshUploadThread* mThread; LLSD mModelData; @@ -433,7 +439,7 @@ public: mObserverHandle(observer_handle) { } - virtual void completed(U32 status, + /*virtual*/ void completed(U32 status, const std::string& reason, const LLSD& content) { @@ -475,7 +481,8 @@ public: } } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return wholeModelUploadResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return wholeModelUploadResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLWholeModelUploadResponder"; } }; #endif //MESH_IMPORT diff --git a/indra/newview/llpanelgroupvoting.cpp b/indra/newview/llpanelgroupvoting.cpp index 3af05adc6..0eac7e5ec 100644 --- a/indra/newview/llpanelgroupvoting.cpp +++ b/indra/newview/llpanelgroupvoting.cpp @@ -693,7 +693,7 @@ public: } //If we get back a normal response, handle it here - virtual void result(const LLSD& content) + /*virtual*/ void result(const LLSD& content) { //Ack'd the proposal initialization, now let's finish up. LLPanelGroupVoting::handleResponse( @@ -702,7 +702,7 @@ public: } //If we get back an error (not found, etc...), handle it here - virtual void error(U32 status, const std::string& reason) + /*virtual*/ void error(U32 status, const std::string& reason) { llinfos << "LLPanelGroupVotingResponder::error " << status << ": " << reason << llendl; @@ -710,8 +710,8 @@ public: LLPanelGroupVoting::handleFailure(mGroupID); } - //Return our timeout policy. - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return startGroupVoteResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return startGroupVoteResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLStartGroupVoteResponder"; } private: LLUUID mGroupID; @@ -726,7 +726,7 @@ public: } //If we get back a normal response, handle it here - virtual void result(const LLSD& content) + /*virtual*/ void result(const LLSD& content) { //Ack'd the proposal initialization, now let's finish up. LLPanelGroupVoting::handleResponse( @@ -736,7 +736,7 @@ public: } //If we get back an error (not found, etc...), handle it here - virtual void error(U32 status, const std::string& reason) + /*virtual*/ void error(U32 status, const std::string& reason) { llinfos << "LLPanelGroupVotingResponder::error " << status << ": " << reason << llendl; @@ -745,7 +745,8 @@ public: } //Return out timeout policy. - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return groupProposalBallotResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return groupProposalBallotResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLGroupProposalBallotResponder"; } private: LLUUID mGroupID; diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 134363bce..99991e769 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -192,7 +192,9 @@ class LLIamHereLogin : public LLHTTPClient::ResponderHeadersOnly } } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return iamHereLogin_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return iamHereLogin_timeout; } + + /*virtual*/ char const* getName(void) const { return "LLIamHereLogin"; } }; // this is global and not a class member to keep crud out of the header file diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp index 4f23117cc..274180174 100644 --- a/indra/newview/llpathfindingmanager.cpp +++ b/indra/newview/llpathfindingmanager.cpp @@ -116,9 +116,10 @@ public: NavMeshStatusResponder(const std::string &pCapabilityURL, LLViewerRegion *pRegion, bool pIsGetStatusOnly); virtual ~NavMeshStatusResponder(); - virtual void result(const LLSD &pContent); - virtual void error(U32 pStatus, const std::string& pReason); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return navMeshStatusResponder_timeout; } + /*virtual*/ void result(const LLSD &pContent); + /*virtual*/ void error(U32 pStatus, const std::string& pReason); + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return navMeshStatusResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "NavMeshStatusResponder"; } protected: @@ -139,9 +140,10 @@ public: NavMeshResponder(const std::string &pCapabilityURL, U32 pNavMeshVersion, LLPathfindingNavMeshPtr pNavMeshPtr); virtual ~NavMeshResponder(); - virtual void result(const LLSD &pContent); - virtual void error(U32 pStatus, const std::string& pReason); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return navMeshResponder_timeout; } + /*virtual*/ void result(const LLSD &pContent); + /*virtual*/ void error(U32 pStatus, const std::string& pReason); + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return navMeshResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "NavMeshResponder"; } protected: @@ -161,9 +163,10 @@ public: AgentStateResponder(const std::string &pCapabilityURL); virtual ~AgentStateResponder(); - virtual void result(const LLSD &pContent); - virtual void error(U32 pStatus, const std::string& pReason); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return agentStateResponder_timeout; } + /*virtual*/ void result(const LLSD &pContent); + /*virtual*/ void error(U32 pStatus, const std::string& pReason); + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return agentStateResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "AgentStateResponder"; } protected: @@ -181,9 +184,10 @@ public: NavMeshRebakeResponder(const std::string &pCapabilityURL, LLPathfindingManager::rebake_navmesh_callback_t pRebakeNavMeshCallback); virtual ~NavMeshRebakeResponder(); - virtual void result(const LLSD &pContent); - virtual void error(U32 pStatus, const std::string& pReason); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return navMeshRebakeResponder_timeout; } + /*virtual*/ void result(const LLSD &pContent); + /*virtual*/ void error(U32 pStatus, const std::string& pReason); + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return navMeshRebakeResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "NavMeshRebakeResponder"; } protected: @@ -241,9 +245,10 @@ public: ObjectLinksetsResponder(const std::string &pCapabilityURL, LinksetsResponderPtr pLinksetsResponsderPtr); virtual ~ObjectLinksetsResponder(); - virtual void result(const LLSD &pContent); - virtual void error(U32 pStatus, const std::string &pReason); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return objectLinksetsResponder_timeout; } + /*virtual*/ void result(const LLSD &pContent); + /*virtual*/ void error(U32 pStatus, const std::string &pReason); + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return objectLinksetsResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "ObjectLinksetsResponder"; } protected: @@ -261,9 +266,10 @@ public: TerrainLinksetsResponder(const std::string &pCapabilityURL, LinksetsResponderPtr pLinksetsResponsderPtr); virtual ~TerrainLinksetsResponder(); - virtual void result(const LLSD &pContent); - virtual void error(U32 pStatus, const std::string &pReason); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return terrainLinksetsResponder_timeout; } + /*virtual*/ void result(const LLSD &pContent); + /*virtual*/ void error(U32 pStatus, const std::string &pReason); + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return terrainLinksetsResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "TerrainLinksetsResponder"; } protected: @@ -281,9 +287,10 @@ public: CharactersResponder(const std::string &pCapabilityURL, LLPathfindingManager::request_id_t pRequestId, LLPathfindingManager::object_request_callback_t pCharactersCallback); virtual ~CharactersResponder(); - virtual void result(const LLSD &pContent); - virtual void error(U32 pStatus, const std::string &pReason); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return charactersResponder_timeout; } + /*virtual*/ void result(const LLSD &pContent); + /*virtual*/ void error(U32 pStatus, const std::string &pReason); + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return charactersResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "CharactersResponder"; } protected: diff --git a/indra/newview/llproductinforequest.cpp b/indra/newview/llproductinforequest.cpp index ff9014deb..27aeea77e 100644 --- a/indra/newview/llproductinforequest.cpp +++ b/indra/newview/llproductinforequest.cpp @@ -46,19 +46,20 @@ class LLProductInfoRequestResponder : public LLHTTPClient::ResponderWithResult { public: //If we get back a normal response, handle it here - virtual void result(const LLSD& content) + /*virtual*/ void result(const LLSD& content) { LLProductInfoRequestManager::instance().setSkuDescriptions(content); } //If we get back an error (not found, etc...), handle it here - virtual void error(U32 status, const std::string& reason) + /*virtual*/ void error(U32 status, const std::string& reason) { llwarns << "LLProductInfoRequest::error(" << status << ": " << reason << ")" << llendl; } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return productInfoRequestResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return productInfoRequestResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLProductInfoRequestResponder"; } }; LLProductInfoRequestManager::LLProductInfoRequestManager() : mSkuDescriptions() diff --git a/indra/newview/llremoteparcelrequest.h b/indra/newview/llremoteparcelrequest.h index abc62a10e..6d212e3e4 100644 --- a/indra/newview/llremoteparcelrequest.h +++ b/indra/newview/llremoteparcelrequest.h @@ -46,10 +46,11 @@ class LLRemoteParcelRequestResponder : public LLHTTPClient::ResponderWithResult public: LLRemoteParcelRequestResponder(LLHandle place_panel_handle); //If we get back a normal response, handle it here - virtual void result(const LLSD& content); + /*virtual*/ void result(const LLSD& content); //If we get back an error (not found, etc...), handle it here - virtual void error(U32 status, const std::string& reason); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return remoteParcelRequestResponder_timeout; } + /*virtual*/ void error(U32 status, const std::string& reason); + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return remoteParcelRequestResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLRemoteParcelRequestResponder"; } protected: LLHandle mPlacePanelHandle; diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 84096d94a..1d8207238 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -312,8 +312,6 @@ public: { } - /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return HTTPGetResponder_timeout; } - #if 0 //Apparently, SL never sends content-range and instead sends transfer-encoding: chunked, so disabling for now /*virtual*/ bool needsHeaders(void) const { return true; } @@ -413,6 +411,9 @@ public: return mFollowRedir; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return HTTPGetResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "HTTPGetResponder"; } + private: LLTextureFetch* mFetcher; LLUUID mID; @@ -3107,8 +3108,7 @@ TFReqSendMetrics::doWork(LLTextureFetch * fetcher) mFetcher->decrCurlPOSTCount(); } - // virtual - void error(U32 status_num, const std::string & reason) + /*virtual*/ void error(U32 status_num, const std::string & reason) { if (mLiveSequence == mExpectedSequence) { @@ -3118,8 +3118,7 @@ TFReqSendMetrics::doWork(LLTextureFetch * fetcher) << reason << LL_ENDL; } - // virtual - void result(const LLSD & content) + /*virtual*/ void result(const LLSD & content) { if (mLiveSequence == mExpectedSequence) { @@ -3127,7 +3126,8 @@ TFReqSendMetrics::doWork(LLTextureFetch * fetcher) mReportingStarted = true; } } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return lcl_responder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return lcl_responder_timeout; } + /*virtual*/ char const* getName(void) const { return "lcl_responder"; } private: LLTextureFetch * mFetcher; diff --git a/indra/newview/lltranslate.h b/indra/newview/lltranslate.h index 7540dd72c..769afc378 100644 --- a/indra/newview/lltranslate.h +++ b/indra/newview/lltranslate.h @@ -43,7 +43,7 @@ extern AIHTTPTimeoutPolicy translationReceiver_timeout; class LLTranslate { public : - class TranslationReceiver: public LLHTTPClient::ResponderWithResult + class TranslationReceiver : public LLHTTPClient::ResponderWithResult { protected: TranslationReceiver(const std::string &fromLang, const std::string &toLang) @@ -60,15 +60,13 @@ public : { } - virtual void error(U32 status, const std::string& reason) + /*virtual*/ void error(U32 status, const std::string& reason) { LL_WARNS("Translate") << "URL Request error: " << reason << LL_ENDL; handleFailure(); } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return translationReceiver_timeout; } - - virtual void completedRaw( + /*virtual*/ void completedRaw( U32 status, const std::string& reason, const LLChannelDescriptors& channels, @@ -100,6 +98,8 @@ public : handleResponse(translation, detectedLanguage); } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return translationReceiver_timeout; } + protected: const std::string m_toLang; const std::string m_fromLang; diff --git a/indra/newview/lluploadfloaterobservers.h b/indra/newview/lluploadfloaterobservers.h index 85cc7b86a..0ddba6735 100644 --- a/indra/newview/lluploadfloaterobservers.h +++ b/indra/newview/lluploadfloaterobservers.h @@ -104,11 +104,10 @@ public: LLUploadModelPremissionsResponder(const LLHandle& observer); - void error(U32 status, const std::string& reason); - - void result(const LLSD& content); - - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return uploadModelPremissionsResponder_timeout; } + /*virtual*/ void error(U32 status, const std::string& reason); + /*virtual*/ void result(const LLSD& content); + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return uploadModelPremissionsResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLUploadModelPremissionsResponder"; } private: LLHandle mObserverHandle; diff --git a/indra/newview/llviewerdisplayname.cpp b/indra/newview/llviewerdisplayname.cpp index 0c917ef4e..ea38be2cb 100644 --- a/indra/newview/llviewerdisplayname.cpp +++ b/indra/newview/llviewerdisplayname.cpp @@ -68,7 +68,8 @@ public: LLViewerDisplayName::sSetDisplayNameSignal.disconnect_all_slots(); } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return setDisplayNameResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return setDisplayNameResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLSetDisplayNameResponder"; } }; void LLViewerDisplayName::set(const std::string& display_name, const set_name_slot_t& slot) diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 9599ae0cc..3e8b49b98 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -117,6 +117,8 @@ public: /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return mimeDiscoveryResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLMimeDiscoveryResponder"; } + public: viewer_media_t mMediaImpl; std::string mDefaultMimeType; @@ -135,16 +137,16 @@ public: { } - /* virtual */ bool needsHeaders(void) const { return true; } + /*virtual*/ bool needsHeaders(void) const { return true; } - /* virtual */ void completedHeaders(U32 status, std::string const& reason, AIHTTPReceivedHeaders const& headers) + /*virtual*/ void completedHeaders(U32 status, std::string const& reason, AIHTTPReceivedHeaders const& headers) { LL_DEBUGS("MediaAuth") << "status = " << status << ", reason = " << reason << LL_ENDL; LL_DEBUGS("MediaAuth") << headers << LL_ENDL; LLViewerMedia::openIDCookieResponse(get_cookie("agni_sl_session_id")); } - /* virtual */ void completedRaw( + /*virtual*/ void completedRaw( U32 status, const std::string& reason, const LLChannelDescriptors& channels, @@ -154,26 +156,21 @@ public: // We don't care about the content of the response, only the set-cookie header. } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return viewerMediaOpenIDResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return viewerMediaOpenIDResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLViewerMediaOpenIDResponder"; } }; class LLViewerMediaWebProfileResponder : public LLHTTPClient::ResponderWithCompleted { LOG_CLASS(LLViewerMediaWebProfileResponder); public: - LLViewerMediaWebProfileResponder(std::string host) - { - mHost = host; - } + LLViewerMediaWebProfileResponder(std::string host) : mHost(host) { } + ~LLViewerMediaWebProfileResponder() { } - ~LLViewerMediaWebProfileResponder() - { - } + /*virtual*/ bool followRedir(void) const { return true; } + /*virtual*/ bool needsHeaders(void) const { return true; } - /* virtual */ bool followRedir(void) const { return true; } - /* virtual */ bool needsHeaders(void) const { return true; } - - /* virtual */ void completedHeaders(U32 status, std::string const& reason, AIHTTPReceivedHeaders const& headers) + /*virtual*/ void completedHeaders(U32 status, std::string const& reason, AIHTTPReceivedHeaders const& headers) { LL_INFOS("MediaAuth") << "status = " << status << ", reason = " << reason << LL_ENDL; LL_INFOS("MediaAuth") << headers << LL_ENDL; @@ -204,7 +201,7 @@ public: } } - void completedRaw( + /*virtual*/ void completedRaw( U32 status, const std::string& reason, const LLChannelDescriptors& channels, @@ -214,8 +211,10 @@ public: // We don't care about the content of the response, only the set-cookie header. } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return viewerMediaWebProfileResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return viewerMediaWebProfileResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLViewerMediaWebProfileResponder"; } +private: std::string mHost; }; diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index c452c85ab..e48565496 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3307,6 +3307,8 @@ protected: delete m_chat; } + /*virtual*/ char const* getName(void) const { return "ChatTranslationReceiver"; } + private: LLChat *m_chat; const BOOL m_history; @@ -3371,6 +3373,7 @@ protected: } /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return authHandler_timeout; } + /*virtual*/ char const* getName(void) const { return "AuthHandler"; } }; void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) diff --git a/indra/newview/llviewerobjectbackup.cpp b/indra/newview/llviewerobjectbackup.cpp index e08968f42..7ca8c41bc 100644 --- a/indra/newview/llviewerobjectbackup.cpp +++ b/indra/newview/llviewerobjectbackup.cpp @@ -111,7 +111,7 @@ void setDefaultTextures() } } -class importResponder: public LLNewAgentInventoryResponder +class importResponder : public LLNewAgentInventoryResponder { public: @@ -191,6 +191,8 @@ public: LLObjectBackup::getInstance()->updateMap(content["new_asset"].asUUID()); LLObjectBackup::getInstance()->uploadNextAsset(); } + + /*virtual*/ char const* getName(void) const { return "importResponder"; } }; class CacheReadResponder : public LLTextureCache::ReadResponder diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 3f1c023df..619300455 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -714,7 +714,7 @@ public: } } - void error(U32 statusNum, const std::string& reason) + /*virtual*/ void error(U32 statusNum, const std::string& reason) { llwarns << "Transport error requesting object cost " @@ -726,7 +726,7 @@ public: clear_object_list_pending_requests(); } - void result(const LLSD& content) + /*virtual*/ void result(const LLSD& content) { if ( !content.isMap() || content.has("error") ) { @@ -776,7 +776,8 @@ public: } } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return objectCostResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return objectCostResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLObjectCostResponder"; } private: LLSD mObjectIDs; @@ -804,7 +805,7 @@ public: } } - void error(U32 statusNum, const std::string& reason) + /*virtual*/ void error(U32 statusNum, const std::string& reason) { llwarns << "Transport error requesting object physics flags " @@ -816,7 +817,7 @@ public: clear_object_list_pending_requests(); } - void result(const LLSD& content) + /*virtual*/ void result(const LLSD& content) { if ( !content.isMap() || content.has("error") ) { @@ -873,7 +874,8 @@ public: } } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return physicsFlagsResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return physicsFlagsResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLPhysicsFlagsResponder"; } private: LLSD mObjectIDs; diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 681cfd4fd..0b8da1053 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -219,7 +219,7 @@ public: virtual ~BaseCapabilitiesComplete() { } - void error(U32 statusNum, const std::string& reason) + /*virtual*/ void error(U32 statusNum, const std::string& reason) { LL_WARNS2("AppInit", "Capabilities") << statusNum << ": " << reason << LL_ENDL; LLViewerRegion *regionp = LLWorld::getInstance()->getRegionFromHandle(mRegionHandle); @@ -229,7 +229,7 @@ public: } } - void result(const LLSD& content) + /*virtual*/ void result(const LLSD& content) { LLViewerRegion *regionp = LLWorld::getInstance()->getRegionFromHandle(mRegionHandle); if(!regionp) //region was removed @@ -265,7 +265,8 @@ public: } } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return baseCapabilitiesComplete_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return baseCapabilitiesComplete_timeout; } + /*virtual*/ char const* getName(void) const { return "BaseCapabilitiesComplete"; } static boost::intrusive_ptr build( U64 region_handle, S32 id ) { @@ -1746,13 +1747,13 @@ public: { } - void error(U32 statusNum, const std::string& reason) + /*virtual*/ void error(U32 statusNum, const std::string& reason) { LL_WARNS2("AppInit", "SimulatorFeatures") << statusNum << ": " << reason << LL_ENDL; retry(); } - void result(const LLSD& content) + /*virtual*/ void result(const LLSD& content) { LLViewerRegion *regionp = LLWorld::getInstance()->getRegionFromHandle(mRegionHandle); if(!regionp) //region is removed or responder is not created. @@ -1764,7 +1765,8 @@ public: regionp->setSimulatorFeatures(content); } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return simulatorFeaturesReceived_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return simulatorFeaturesReceived_timeout; } + /*virtual*/ char const* getName(void) const { return "SimulatorFeaturesReceived"; } private: void retry() diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index 8a2667555..aff4334a6 100644 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -703,18 +703,19 @@ class ViewerStatsResponder : public LLHTTPClient::ResponderWithResult public: ViewerStatsResponder() { } - void error(U32 statusNum, const std::string& reason) + /*virtual*/ void error(U32 statusNum, const std::string& reason) { llinfos << "ViewerStatsResponder::error " << statusNum << " " << reason << llendl; } - void result(const LLSD& content) + /*virtual*/ void result(const LLSD& content) { llinfos << "ViewerStatsResponder::result" << llendl; } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return viewerStatsResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return viewerStatsResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "ViewerStatsResponder"; } }; /* diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 55f4f656b..b0cc19cd7 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -143,8 +143,7 @@ static int scale_speaker_volume(float volume) return scaled_volume; } -class LLViewerVoiceAccountProvisionResponder : - public LLHTTPClient::ResponderWithResult +class LLViewerVoiceAccountProvisionResponder : public LLHTTPClient::ResponderWithResult { public: LLViewerVoiceAccountProvisionResponder(int retries) @@ -152,7 +151,7 @@ public: mRetries = retries; } - virtual void error(U32 status, const std::string& reason) + /*virtual*/ void error(U32 status, const std::string& reason) { if ( mRetries > 0 ) { @@ -167,7 +166,7 @@ public: } } - virtual void result(const LLSD& content) + /*virtual*/ void result(const LLSD& content) { if ( gVoiceClient ) { @@ -191,7 +190,8 @@ public: } } - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return viewerVoiceAccountProvisionResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return viewerVoiceAccountProvisionResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLViewerVoiceAccountProvisionResponder"; } private: int mRetries; @@ -1019,9 +1019,10 @@ class LLVoiceClientCapResponder : public LLHTTPClient::ResponderWithResult public: LLVoiceClientCapResponder(void){}; - virtual void error(U32 status, const std::string& reason); // called with bad status codes - virtual void result(const LLSD& content); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return voiceClientCapResponder_timeout; } + /*virtual*/ void error(U32 status, const std::string& reason); // called with bad status codes + /*virtual*/ void result(const LLSD& content); + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return voiceClientCapResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLVoiceClientCapResponder"; } private: }; diff --git a/indra/newview/llwebprofile.cpp b/indra/newview/llwebprofile.cpp index 992307160..b6f8e0a65 100644 --- a/indra/newview/llwebprofile.cpp +++ b/indra/newview/llwebprofile.cpp @@ -121,6 +121,7 @@ public: protected: /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return webProfileResponders_timeout; } /*virtual*/ bool followRedir(void) const { return true; } + /*virtual*/ char const* getName(void) const { return "LLWebProfileResponders::ConfigResponder"; } private: LLPointer mImagep; @@ -156,8 +157,9 @@ public: } protected: - /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return webProfileResponders_timeout; } /*virtual*/ bool followRedir(void) const { return true; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return webProfileResponders_timeout; } + /*virtual*/ char const* getName(void) const { return "LLWebProfileResponders::PostImageRedirectResponder"; } private: LLPointer mImagep; @@ -206,8 +208,9 @@ public: } protected: - /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return webProfileResponders_timeout; } /*virtual*/ bool redirect_status_ok(void) const { return true; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return webProfileResponders_timeout; } + /*virtual*/ char const* getName(void) const { return "LLWebProfileResponders::PostImageResponder"; } }; /////////////////////////////////////////////////////////////////////////////// diff --git a/indra/newview/llwlhandlers.h b/indra/newview/llwlhandlers.h index af19c74b3..969e188b6 100644 --- a/indra/newview/llwlhandlers.h +++ b/indra/newview/llwlhandlers.h @@ -56,9 +56,10 @@ class LLEnvironmentRequestResponder: public LLHTTPClient::ResponderWithResult { LOG_CLASS(LLEnvironmentRequestResponder); public: - virtual void result(const LLSD& content); - virtual void error(U32 status, const std::string& reason); - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return environmentRequestResponder_timeout; } + /*virtual*/ void result(const LLSD& content); + /*virtual*/ void error(U32 status, const std::string& reason); + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return environmentRequestResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLEnvironmentRequestResponder"; } private: friend class LLEnvironmentRequest; @@ -80,7 +81,7 @@ private: static clock_t UPDATE_WAIT_SECONDS; }; -class LLEnvironmentApplyResponder: public LLHTTPClient::ResponderWithResult +class LLEnvironmentApplyResponder : public LLHTTPClient::ResponderWithResult { LOG_CLASS(LLEnvironmentApplyResponder); public: @@ -98,11 +99,12 @@ public: * fail_reason : string * } */ - virtual void result(const LLSD& content); + /*virtual*/ void result(const LLSD& content); - virtual void error(U32 status, const std::string& reason); // non-200 errors only + /*virtual*/ void error(U32 status, const std::string& reason); // non-200 errors only - virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return environmentApplyResponder_timeout; } + /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return environmentApplyResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "LLEnvironmentApplyResponder"; } private: friend class LLEnvironmentApply; diff --git a/indra/newview/llxmlrpcresponder.h b/indra/newview/llxmlrpcresponder.h index dbaa45260..25615f236 100644 --- a/indra/newview/llxmlrpcresponder.h +++ b/indra/newview/llxmlrpcresponder.h @@ -112,6 +112,7 @@ public: /*virtual*/ void completed_headers(U32 status, std::string const& reason, AITransferInfo* info); /*virtual*/ void completedRaw(U32 status, std::string const& reason, LLChannelDescriptors const& channels, buffer_ptr_t const& buffer); /*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return XMLRPCResponder_timeout; } + /*virtual*/ char const* getName(void) const { return "XMLRPCResponder"; } }; #endif // LLXMLRPCRESPONDER_H From 56542a02e8109edd3f2af62d71216a6ffd60ce31 Mon Sep 17 00:00:00 2001 From: Latif Khalifa Date: Fri, 11 Jan 2013 11:28:21 +0100 Subject: [PATCH 06/19] Use multiple cores for compilation of the Debug build --- indra/cmake/00-Common.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 5eaca5c32..f422ed4ae 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -29,7 +29,7 @@ if (WINDOWS) # Don't build DLLs. set(BUILD_SHARED_LIBS OFF) - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /arch:SSE2" + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /MP /arch:SSE2" CACHE STRING "C++ compiler debug options" FORCE) set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP /arch:SSE2" From f9a868a97976b90d5d6d6bf33dc5e8eadfd67c64 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Fri, 11 Jan 2013 17:16:05 +0100 Subject: [PATCH 07/19] Compile fix for VC++ --- indra/llcommon/llerrorlegacy.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/llcommon/llerrorlegacy.h b/indra/llcommon/llerrorlegacy.h index 36f64bace..cbd86fd29 100644 --- a/indra/llcommon/llerrorlegacy.h +++ b/indra/llcommon/llerrorlegacy.h @@ -136,11 +136,11 @@ const int LL_ERR_PRICE_MISMATCH = -23018; // void foo(x, ASSERT_ONLY(int y,) int z); // void foo(x/*,*/ ASSERT_ONLY_COMMA(int y)); // The optional /*,*/ makes it just a bit better readable. #ifdef SHOW_ASSERT -#define ASSERT_ONLY(type_param,...) type_param,##__VA_ARGS__ -#define ASSERT_ONLY_COMMA(type_param,...) , type_param,##__VA_ARGS__ +#define ASSERT_ONLY(...) __VA_ARGS__ +#define ASSERT_ONLY_COMMA(...) , __VA_ARGS__ #else -#define ASSERT_ONLY(type_param,...) -#define ASSERT_ONLY_COMMA(type_param,...) +#define ASSERT_ONLY(...) +#define ASSERT_ONLY_COMMA(...) #endif // handy compile-time assert - enforce those template parameters! From e51937cee758609b96974464ad2e2252f12fa2ba Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Fri, 11 Jan 2013 18:21:48 -0500 Subject: [PATCH 08/19] Warn more clearly about LLRadioGroup::setValue being used wrong, and attempt to recover with LLUICtrl::setValue. --- indra/llui/llradiogroup.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/llui/llradiogroup.cpp b/indra/llui/llradiogroup.cpp index 5c715d3ff..b193c22b2 100644 --- a/indra/llui/llradiogroup.cpp +++ b/indra/llui/llradiogroup.cpp @@ -316,7 +316,8 @@ void LLRadioGroup::setValue( const LLSD& value ) } else { - llwarns << "LLRadioGroup::setValue: value not found: " << value_name << llendl; + llwarns << "LLRadioGroup::setValue: radio_item with name=\"" << value_name << "\" not found, radio_group values are set by radio_item name not value. Falling back on LLUICtrl::setValue." << llendl; + LLUICtrl::setValue(value); } } } From 82eb1a946e61ce9980bb4a61ea4c38c9b979485c Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Fri, 11 Jan 2013 19:17:06 -0500 Subject: [PATCH 09/19] Fix group buttons in horizontal and allow the horizontal buttoned friends and groups floater to take up minimal space. --- .../default/xui/en-us/floater_my_friends_horiz.xml | 6 +++--- .../skins/default/xui/en-us/panel_groups_horiz.xml | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/indra/newview/skins/default/xui/en-us/floater_my_friends_horiz.xml b/indra/newview/skins/default/xui/en-us/floater_my_friends_horiz.xml index 6a488b21f..3bd626c13 100644 --- a/indra/newview/skins/default/xui/en-us/floater_my_friends_horiz.xml +++ b/indra/newview/skins/default/xui/en-us/floater_my_friends_horiz.xml @@ -1,10 +1,10 @@ + name="friends_and_groups" tab_position="top" tab_min_width="0" width="383"> diff --git a/indra/newview/skins/default/xui/en-us/panel_groups_horiz.xml b/indra/newview/skins/default/xui/en-us/panel_groups_horiz.xml index 2fa154096..988d8349c 100644 --- a/indra/newview/skins/default/xui/en-us/panel_groups_horiz.xml +++ b/indra/newview/skins/default/xui/en-us/panel_groups_horiz.xml @@ -1,7 +1,7 @@ - Your currently active group is displayed in italics. You belong to [COUNT] groups (of [MAX] maximum). @@ -35,13 +35,13 @@ label="Info" name="Info" width="80" />