diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloaterimagepreview.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/linden/indra/newview/llfloaterimagepreview.cpp b/linden/indra/newview/llfloaterimagepreview.cpp index 551ae95..926a117 100644 --- a/linden/indra/newview/llfloaterimagepreview.cpp +++ b/linden/indra/newview/llfloaterimagepreview.cpp | |||
@@ -353,7 +353,7 @@ bool LLFloaterImagePreview::loadImage(const char *src_filename) | |||
353 | return false; | 353 | return false; |
354 | } | 354 | } |
355 | 355 | ||
356 | if (!bmp_image->decode(raw_image)) | 356 | if (!bmp_image->decode(raw_image, 0.0f)) |
357 | { | 357 | { |
358 | return false; | 358 | return false; |
359 | } | 359 | } |
@@ -390,7 +390,7 @@ bool LLFloaterImagePreview::loadImage(const char *src_filename) | |||
390 | return false; | 390 | return false; |
391 | } | 391 | } |
392 | 392 | ||
393 | if (!jpeg_image->decode(raw_image)) | 393 | if (!jpeg_image->decode(raw_image, 0.0f)) |
394 | { | 394 | { |
395 | return false; | 395 | return false; |
396 | } | 396 | } |
@@ -405,7 +405,7 @@ bool LLFloaterImagePreview::loadImage(const char *src_filename) | |||
405 | return false; | 405 | return false; |
406 | } | 406 | } |
407 | 407 | ||
408 | if (!png_image->decode(raw_image)) | 408 | if (!png_image->decode(raw_image, 0.0f)) |
409 | { | 409 | { |
410 | return false; | 410 | return false; |
411 | } | 411 | } |
@@ -589,7 +589,8 @@ BOOL LLFloaterImagePreview::handleScrollWheel(S32 x, S32 y, S32 clicks) | |||
589 | //----------------------------------------------------------------------------- | 589 | //----------------------------------------------------------------------------- |
590 | // onMouseCaptureLost() | 590 | // onMouseCaptureLost() |
591 | //----------------------------------------------------------------------------- | 591 | //----------------------------------------------------------------------------- |
592 | void LLFloaterImagePreview::onMouseCaptureLost(LLMouseHandler* handler) | 592 | // static |
593 | void LLFloaterImagePreview::onMouseCaptureLostImagePreview(LLMouseHandler* handler) | ||
593 | { | 594 | { |
594 | gViewerWindow->showCursor(); | 595 | gViewerWindow->showCursor(); |
595 | } | 596 | } |