From 3609359ca157d122a15480f19fea18de0015cb3c Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Mon, 22 Feb 2010 13:47:15 +0100
Subject: Ported temporary texture uploads from Emerald.
---
linden/indra/newview/app_settings/settings.xml | 15 +++++
linden/indra/newview/llfloaterimagepreview.cpp | 4 ++
linden/indra/newview/llfloatersnapshot.cpp | 41 ++++++------
linden/indra/newview/llinventorybridge.cpp | 26 +++++++-
linden/indra/newview/llinventorybridge.h | 2 +
linden/indra/newview/llviewermenufile.cpp | 75 ++++++++++++++++++----
.../default/xui/en-us/floater_image_preview.xml | 4 ++
.../skins/default/xui/en-us/floater_snapshot.xml | 11 +++-
8 files changed, 140 insertions(+), 38 deletions(-)
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 5687eb7..93dc2fb 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -3415,6 +3415,21 @@
1.0
+
+
+ EmeraldTemporaryUpload
+
+
+
EnableRippleWater