24 files changed, 650 insertions, 414 deletions

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index ddf6897..0205ceb 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -8,6 +8,7 @@ include(BuildVersion)
 include(DirectX)
 include(ELFIO)
 include(FMOD)
+include(OPENAL)
 include(FindOpenGL)
 include(LLAudio)
 include(LLCharacter)
@@ -31,7 +32,6 @@ include(NDOF)
 include(TemplateCheck)
 include(UI)
 include(UnixInstall)
-include(LLKDU)
 include(ViewerMiscLibs)
 
 if (WINDOWS)
@@ -56,6 +56,7 @@ include_directories(
     ${LLXML_INCLUDE_DIRS}
     ${LSCRIPT_INCLUDE_DIRS}
     ${LSCRIPT_INCLUDE_DIRS}/lscript_compile
+    ${GSTREAMER_INCLUDE_DIRS}
     )
 
 set(viewer_SOURCE_FILES
@@ -430,6 +431,9 @@ set(viewer_SOURCE_FILES
     pipeline.cpp
     )
 
+set(VIEWER_BINARY_NAME "imprudence-bin" CACHE STRING
+    "The name of the viewer executable to create.")
+
 if (LINUX)
   # We can't set these flags for Darwin, because they get passed to
   # the PPC compiler.  Ugh.
@@ -850,8 +854,8 @@ if (DARWIN)
     secondlife.icns
     macview.r
     gpu_table.txt
-    Info-SecondLife.plist
-    SecondLife.nib/
+    Info-Imprudence.plist
+    Imprudence.nib/
     # CMake doesn't seem to support Xcode language variants well just yet
     English.lproj/InfoPlist.strings
     English.lproj/language.txt
@@ -1239,8 +1243,13 @@ set_source_files_properties(${viewer_CHARACTER_FILES}
 
 list(APPEND viewer_SOURCE_FILES ${viewer_CHARACTER_FILES})
 
+
+if (OPENAL)
+  set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_OPENAL")
+endif (OPENAL)
+
 if (FMOD)
-  set_source_files_properties(llstartup.cpp PROPERTIES COMPILE_FLAGS -DLL_FMOD)
+  set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_FMOD")
 
   if (NOT WINDOWS)
     set(fmodwrapper_SOURCE_FILES fmodwrapper.cpp)
@@ -1260,6 +1269,8 @@ if (FMOD)
   endif (NOT WINDOWS)
 endif (FMOD)
 
+set_source_files_properties(llstartup.cpp PROPERTIES COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS}")
+
 list(APPEND viewer_SOURCE_FILES ${viewer_HEADER_FILES})
 
 set_source_files_properties(${viewer_HEADER_FILES}
@@ -1272,10 +1283,6 @@ add_executable(imprudence-bin
     )
 check_message_template(imprudence-bin)
 
-if (LLKDU_LIBRARY)
-  add_dependencies(imprudence-bin ${LLKDU_LIBRARY})
-endif (LLKDU_LIBRARY)
-
 set(PACKAGE OFF CACHE BOOL
     "Add a package target that builds an installer package.")
 
@@ -1467,24 +1474,27 @@ if (DARWIN)
     )
 
   if (PACKAGE)
-    add_custom_target(package
-      COMMAND
-        ${PYTHON_EXECUTABLE}
-        ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
-        --grid=${GRID}
-        --configuration=${CMAKE_CFG_INTDIR}
-        --channel=${VIEWER_CHANNEL}
-        --login_channel=${VIEWER_CHANNEL}
-        --source=${CMAKE_CURRENT_SOURCE_DIR}
-        --artwork=${ARTWORK_DIR}
-        --build=${CMAKE_CURRENT_BINARY_DIR}
-        --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app
-        --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched
-      DEPENDS
-        imprudence-bin
-        ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
-      )
+      add_custom_target(package ALL DEPENDS imprudence-bin) 
       add_dependencies(package mac-updater mac-crash-logger)
+
+      add_custom_command(
+        TARGET package POST_BUILD
+        COMMAND ${PYTHON_EXECUTABLE}
+        ARGS
+          ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+          --grid=${GRID}
+          --configuration=${CMAKE_CFG_INTDIR}
+          --channel=${VIEWER_CHANNEL}
+          --login_channel=${VIEWER_LOGIN_CHANNEL}
+          --source=${CMAKE_CURRENT_SOURCE_DIR}
+          --artwork=${ARTWORK_DIR}
+          --build=${CMAKE_CURRENT_BINARY_DIR}
+          --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app
+          --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched
+        DEPENDS
+          ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+      )
+
   endif (PACKAGE)
 endif (DARWIN)
 
diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index d7bb64c..f3b08f9 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -40,6 +40,13 @@
                                                 </array>
                                         <key>tags</key>
                                                 <array>
+                                                <string>OpenAL</string>
+                                                <string>AudioEngine</string>
+                                                <string>MediaImpl</string>
+                                                <string>MediaInfo</string>
+                                                <string>MediaCallback</string>
+                                                <string>MediaBuffering</string>
+                                                <string>MediaState</string>
                                                 </array>
                                 </map>
                         </array>
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index ca3dd81..7e591bf 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -4820,7 +4820,7 @@
     <key>MuteAmbient</key>
     <map>
       <key>Comment</key>
-      <string>Ambient sound effects, such as wind noise, play at 0 volume</string>
+      <string>Ambient sound effects, play at 0 volume</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -4905,6 +4905,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>MuteWind</key>
+    <map>
+      <key>Comment</key>
+      <string>Mute inworld wind generation</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+  </map>
     <key>NewCacheLocation</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 14214b5..9e68078 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -109,6 +109,7 @@
 #include "llpostprocess.h"
 #include "llwlparammanager.h"
 #include "llwaterparammanager.h"
+#include "llcalc.h"
 
 #include "lldebugview.h"
 #include "llconsole.h"
@@ -1176,10 +1177,13 @@ bool LLAppViewer::cleanup()
         LLNotifyBox::cleanup();
 
         LLWorldMap::getInstance()->reset(); // release any images
+
+        LLCalc::cleanUp();
         
         llinfos << "Global stuff deleted" << llendflush;
 
-#if !LL_RELEASE_FOR_DOWNLOAD
+#if (!defined(LL_FMOD)) || (!LL_RELEASE_FOR_DOWNLOAD)
+        // OpenAL likes to crash on exit if we *don't* explicitly shut it down.
         if (gAudiop)
         {
                 gAudiop->shutdown();
@@ -1601,7 +1605,7 @@ bool LLAppViewer::initConfiguration()
 
         // - set procedural settings 
         gSavedSettings.setString("ClientSettingsFile", 
-        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFileName("Global")));
+        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_imprudence.xml"));
 
         gSavedSettings.setString("VersionChannelName", IMP_VIEWER_NAME);
 
diff --git a/linden/indra/newview/llaudiosourcevo.cpp b/linden/indra/newview/llaudiosourcevo.cpp
index e668078..9c25d94 100644
--- a/linden/indra/newview/llaudiosourcevo.cpp
+++ b/linden/indra/newview/llaudiosourcevo.cpp
@@ -39,7 +39,7 @@
 #include "llviewerparcelmgr.h"
 
 LLAudioSourceVO::LLAudioSourceVO(const LLUUID &sound_id, const LLUUID& owner_id, const F32 gain, LLViewerObject *objectp)
-:       LLAudioSource(sound_id, owner_id, gain), 
+: LLAudioSource(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX), 
         mObjectp(objectp), 
         mActualGain(gain)
 {
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index af436c5..4953410 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -41,6 +41,7 @@
 
 #include "llcurl.h"
 #include "llimagej2c.h"
+#include "audioengine.h"
 
 #include "llviewertexteditor.h"
 #include "llviewercontrol.h"
@@ -200,6 +201,10 @@ LLFloaterAbout::LLFloaterAbout()
         support.append( LLImageJ2C::getEngineInfo() );
         support.append("\n");
 
+        support.append("Audio Driver Version: ");
+        support.append( gAudiop ? gAudiop->getDriverName(true) : "(none)" );
+        support.append("\n");
+
         LLMediaManager *mgr = LLMediaManager::getInstance();
         if (mgr)
         {
diff --git a/linden/indra/newview/llpanelface.cpp b/linden/indra/newview/llpanelface.cpp
index 4742627..d1c34f1 100644
--- a/linden/indra/newview/llpanelface.cpp
+++ b/linden/indra/newview/llpanelface.cpp
@@ -35,6 +35,7 @@
 #include "llpanelface.h"
  
 // library includes
+#include "llcalc.h"
 #include "llerror.h"
 #include "llfocusmgr.h"
 #include "llrect.h"
@@ -60,6 +61,7 @@
 #include "llviewermedia.h"
 #include "llviewerobject.h"
 #include "llviewerstats.h"
+#include "llviewerwindow.h"
 #include "lluictrlfactory.h"
 
 //
@@ -179,6 +181,7 @@ BOOL	LLPanelFace::postBuild()
         childSetCommitCallback("TexOffsetU",LLPanelFace::onCommitTextureInfo, this);
         childSetCommitCallback("TexOffsetV",LLPanelFace::onCommitTextureInfo, this);
         childSetAction("button align",onClickAutoFix,this);
+        childSetAction("texture_math_constants",onClickTextureConstants,this);
 
         clearCtrls();
 
@@ -381,6 +384,7 @@ void LLPanelFace::sendTextureInfo()
 void LLPanelFace::getState()
 {
         LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+        LLCalc* calcp = LLCalc::getInstance();
 
         if( objectp
                 && objectp->getPCode() == LL_PCODE_VOLUME
@@ -754,6 +758,16 @@ void LLPanelFace::getState()
                                 childSetEnabled("button apply",enabled);
                         }
                 }
+                childSetEnabled("texture_math_constants",true);
+
+                // Set variable values for numeric expressions
+                calcp->setVar(LLCalc::TEX_U_SCALE, childGetValue("TexScaleU").asReal());
+                calcp->setVar(LLCalc::TEX_V_SCALE, childGetValue("TexScaleV").asReal());
+                calcp->setVar(LLCalc::TEX_U_OFFSET, childGetValue("TexOffsetU").asReal());
+                calcp->setVar(LLCalc::TEX_V_OFFSET, childGetValue("TexOffsetV").asReal());
+                calcp->setVar(LLCalc::TEX_ROTATION, childGetValue("TexRot").asReal());
+                calcp->setVar(LLCalc::TEX_TRANSPARENCY, childGetValue("ColorTrans").asReal());
+                calcp->setVar(LLCalc::TEX_GLOW, childGetValue("glow").asReal());
         }
         else
         {
@@ -787,6 +801,17 @@ void LLPanelFace::getState()
 
                 childSetEnabled("button align",FALSE);
                 childSetEnabled("button apply",FALSE);
+
+                childSetEnabled("texture_math_constants",false);
+
+                // Set variable values for numeric expressions
+                calcp->clearVar(LLCalc::TEX_U_SCALE);
+                calcp->clearVar(LLCalc::TEX_V_SCALE);
+                calcp->clearVar(LLCalc::TEX_U_OFFSET);
+                calcp->clearVar(LLCalc::TEX_V_OFFSET);
+                calcp->clearVar(LLCalc::TEX_ROTATION);
+                calcp->clearVar(LLCalc::TEX_TRANSPARENCY);
+                calcp->clearVar(LLCalc::TEX_GLOW);              
         }
 }
 
@@ -969,3 +994,9 @@ void LLPanelFace::onClickAutoFix(void* userdata)
         LLPanelFaceSendFunctor sendfunc;
         LLSelectMgr::getInstance()->getSelection()->applyToObjects(&sendfunc);
 }
+
+// static
+void LLPanelFace::onClickTextureConstants(void *)
+{
+        gViewerWindow->alertXml("ClickTextureConstants");
+}
\ No newline at end of file
diff --git a/linden/indra/newview/llpanelface.h b/linden/indra/newview/llpanelface.h
index 230772b..b977583 100644
--- a/linden/indra/newview/llpanelface.h
+++ b/linden/indra/newview/llpanelface.h
@@ -88,6 +88,7 @@ protected:
 
         static void             onClickApply(void*);
         static void             onClickAutoFix(void*);
+        static void             onClickTextureConstants(void *);
         static F32      valueGlow(LLViewerObject* object, S32 face);
 };
 
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index cc9d969..5cd8690 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -46,6 +46,7 @@
 // project includes
 #include "llagent.h"
 #include "llbutton.h"
+#include "llcalc.h"
 #include "llcheckboxctrl.h"
 #include "llcolorswatch.h"
 #include "llcombobox.h"
@@ -109,6 +110,9 @@ BOOL	LLPanelObject::postBuild()
         // Top
         //--------------------------------------------------------
         
+        // Build constant tipsheet
+        childSetAction("build_math_constants",onClickBuildConstants,this);
+
         // Lock checkbox
         mCheckLock = getChild<LLCheckBoxCtrl>("checkbox locked");
         childSetCommitCallback("checkbox locked",onCommitLock,this);
@@ -341,6 +345,8 @@ void LLPanelObject::getState( )
                 }
         }
 
+        LLCalc* calcp = LLCalc::getInstance();
+        
         LLVOVolume *volobjp = NULL;
         if ( objectp && (objectp->getPCode() == LL_PCODE_VOLUME))
         {
@@ -357,6 +363,7 @@ void LLPanelObject::getState( )
 
                 // Disable all text input fields
                 clearCtrls();
+                calcp->clearAllVariables();
                 return;
         }
 
@@ -365,6 +372,7 @@ void LLPanelObject::getState( )
         BOOL enable_scale       = objectp->permMove() && objectp->permModify();
         BOOL enable_rotate      = objectp->permMove() && ( (objectp->permModify() && !objectp->isAttachment()) || !gSavedSettings.getBOOL("EditLinkedParts"));
 
+        childSetEnabled("build_math_constants",true);
         LLVector3 vec;
         if (enable_move)
         {
@@ -372,12 +380,18 @@ void LLPanelObject::getState( )
                 mCtrlPosX->set( vec.mV[VX] );
                 mCtrlPosY->set( vec.mV[VY] );
                 mCtrlPosZ->set( vec.mV[VZ] );
+                calcp->setVar(LLCalc::X_POS, vec.mV[VX]);
+                calcp->setVar(LLCalc::Y_POS, vec.mV[VY]);
+                calcp->setVar(LLCalc::Z_POS, vec.mV[VZ]);
         }
         else
         {
                 mCtrlPosX->clear();
                 mCtrlPosY->clear();
                 mCtrlPosZ->clear();
+                calcp->clearVar(LLCalc::X_POS);
+                calcp->clearVar(LLCalc::Y_POS);
+                calcp->clearVar(LLCalc::Z_POS);
         }
 
 
@@ -392,12 +406,18 @@ void LLPanelObject::getState( )
                 mCtrlScaleX->set( vec.mV[VX] );
                 mCtrlScaleY->set( vec.mV[VY] );
                 mCtrlScaleZ->set( vec.mV[VZ] );
+                calcp->setVar(LLCalc::X_SCALE, vec.mV[VX]);
+                calcp->setVar(LLCalc::Y_SCALE, vec.mV[VY]);
+                calcp->setVar(LLCalc::Z_SCALE, vec.mV[VZ]);
         }
         else
         {
                 mCtrlScaleX->clear();
                 mCtrlScaleY->clear();
                 mCtrlScaleZ->clear();
+                calcp->setVar(LLCalc::X_SCALE, 0.f);
+                calcp->setVar(LLCalc::Y_SCALE, 0.f);
+                calcp->setVar(LLCalc::Z_SCALE, 0.f);
         }
 
         mLabelSize->setEnabled( enable_scale );
@@ -417,12 +437,18 @@ void LLPanelObject::getState( )
                 mCtrlRotX->set( mCurEulerDegrees.mV[VX] );
                 mCtrlRotY->set( mCurEulerDegrees.mV[VY] );
                 mCtrlRotZ->set( mCurEulerDegrees.mV[VZ] );
+                calcp->setVar(LLCalc::X_ROT, mCurEulerDegrees.mV[VX]);
+                calcp->setVar(LLCalc::Y_ROT, mCurEulerDegrees.mV[VY]);
+                calcp->setVar(LLCalc::Z_ROT, mCurEulerDegrees.mV[VZ]);
         }
         else
         {
                 mCtrlRotX->clear();
                 mCtrlRotY->clear();
                 mCtrlRotZ->clear();
+                calcp->clearVar(LLCalc::X_ROT);
+                calcp->clearVar(LLCalc::Y_ROT);
+                calcp->clearVar(LLCalc::Z_ROT);
         }
 
         mLabelRotation->setEnabled( enable_rotate );
@@ -678,8 +704,9 @@ void LLPanelObject::getState( )
                 F32 end_t       = volume_params.getEndT();
 
                 // Hollowness
-                F32 hollow = volume_params.getHollow();
-                mSpinHollow->set( 100.f * hollow );
+                F32 hollow = 100.f * volume_params.getHollow();
+                mSpinHollow->set( hollow );
+                calcp->setVar(LLCalc::HOLLOW, hollow);
 
                 // All hollow objects allow a shape to be selected.
                 if (hollow > 0.f)
@@ -732,6 +759,10 @@ void LLPanelObject::getState( )
                 mSpinCutEnd             ->set( cut_end );
                 mCtrlPathBegin  ->set( adv_cut_begin );
                 mCtrlPathEnd    ->set( adv_cut_end );
+                calcp->setVar(LLCalc::CUT_BEGIN, cut_begin);
+                calcp->setVar(LLCalc::CUT_END, cut_end);
+                calcp->setVar(LLCalc::PATH_BEGIN, adv_cut_begin);
+                calcp->setVar(LLCalc::PATH_END, adv_cut_end);
 
                 // Twist
                 F32 twist               = volume_params.getTwist();
@@ -750,18 +781,24 @@ void LLPanelObject::getState( )
 
                 mSpinTwist              ->set( twist );
                 mSpinTwistBegin ->set( twist_begin );
+                calcp->setVar(LLCalc::TWIST_END, twist);
+                calcp->setVar(LLCalc::TWIST_BEGIN, twist_begin);
 
                 // Shear
                 F32 shear_x = volume_params.getShearX();
                 F32 shear_y = volume_params.getShearY();
                 mSpinShearX->set( shear_x );
                 mSpinShearY->set( shear_y );
+                calcp->setVar(LLCalc::X_SHEAR, shear_x);
+                calcp->setVar(LLCalc::Y_SHEAR, shear_y);
 
                 // Taper
                 F32 taper_x     = volume_params.getTaperX();
                 F32 taper_y = volume_params.getTaperY();
                 mSpinTaperX->set( taper_x );
                 mSpinTaperY->set( taper_y );
+                calcp->setVar(LLCalc::X_TAPER, taper_x);
+                calcp->setVar(LLCalc::Y_TAPER, taper_y);
 
                 // Radius offset.
                 F32 radius_offset = volume_params.getRadiusOffset();
@@ -791,10 +828,12 @@ void LLPanelObject::getState( )
                         }
                 }
                 mSpinRadiusOffset->set( radius_offset);
+                calcp->setVar(LLCalc::RADIUS_OFFSET, radius_offset);
 
                 // Revolutions
                 F32 revolutions = volume_params.getRevolutions();
                 mSpinRevolutions->set( revolutions );
+                calcp->setVar(LLCalc::REVOLUTIONS, revolutions);
                 
                 // Skew
                 F32 skew        = volume_params.getSkew();
@@ -819,6 +858,7 @@ void LLPanelObject::getState( )
                         }
                 }
                 mSpinSkew->set( skew );
+                calcp->setVar(LLCalc::SKEW, skew);
         }
 
         // Compute control visibility, label names, and twist range.
@@ -924,6 +964,8 @@ void LLPanelObject::getState( )
         case MI_RING:
                 mSpinScaleX->set( scale_x );
                 mSpinScaleY->set( scale_y );
+                calcp->setVar(LLCalc::X_HOLE, scale_x);
+                calcp->setVar(LLCalc::Y_HOLE, scale_y);
                 mSpinScaleX->setMinValue(OBJECT_MIN_HOLE_SIZE);
                 mSpinScaleX->setMaxValue(OBJECT_MAX_HOLE_SIZE_X);
                 mSpinScaleY->setMinValue(OBJECT_MIN_HOLE_SIZE);
@@ -934,6 +976,8 @@ void LLPanelObject::getState( )
                 {
                         mSpinScaleX->set( 1.f - scale_x );
                         mSpinScaleY->set( 1.f - scale_y );
+                        calcp->setVar(LLCalc::X_HOLE, 1.f - scale_x);
+                        calcp->setVar(LLCalc::Y_HOLE, 1.f - scale_y);
                         mSpinScaleX->setMinValue(-1.f);
                         mSpinScaleX->setMaxValue(1.f);
                         mSpinScaleY->setMinValue(-1.f);
@@ -1148,7 +1192,7 @@ void LLPanelObject::getState( )
                 mSculptTextureRevert = LLUUID::null;
         }
 
-        
+
         //----------------------------------------------------------------------------
 
         mObject = objectp;
@@ -1913,6 +1957,8 @@ void LLPanelObject::clearCtrls()
         childSetEnabled( "advanced_cut", FALSE );
         childSetEnabled( "advanced_dimple", FALSE );
         childSetVisible("advanced_slice", FALSE);
+
+        childSetEnabled("build_math_constants",false);
 }
 
 //
@@ -1954,6 +2000,9 @@ void LLPanelObject::onCommitRotation( LLUICtrl* ctrl, void* userdata )
         LLPanelObject* self = (LLPanelObject*) userdata;
         BOOL btn_down = ((LLSpinCtrl*)ctrl)->isMouseHeldDown() ;
         self->sendRotation(btn_down);
+
+        // Needed to ensure all rotations are shown consistently in range
+        self->refresh();
 }
 
 // static
@@ -2048,3 +2097,9 @@ void LLPanelObject::onCommitSculptType(LLUICtrl *ctrl, void* userdata)
 
         self->sendSculpt();
 }
+
+// static
+void LLPanelObject::onClickBuildConstants(void *)
+{
+        gViewerWindow->alertXml("ClickBuildConstants");
+}
diff --git a/linden/indra/newview/llpanelobject.h b/linden/indra/newview/llpanelobject.h
index afdfd30..b72289c 100644
--- a/linden/indra/newview/llpanelobject.h
+++ b/linden/indra/newview/llpanelobject.h
@@ -83,6 +83,7 @@ public:
         static BOOL     onDropSculpt(          LLUICtrl* ctrl, LLInventoryItem* item, void* ud);
         static void     onCommitSculptType(    LLUICtrl *ctrl, void* userdata);
                 
+        static void             onClickBuildConstants(void *);
         
 protected:
         void                    getState();
diff --git a/linden/indra/newview/llpreviewlandmark.cpp b/linden/indra/newview/llpreviewlandmark.cpp
index 01d77f6..dba603b 100644
--- a/linden/indra/newview/llpreviewlandmark.cpp
+++ b/linden/indra/newview/llpreviewlandmark.cpp
@@ -90,7 +90,15 @@ LLPreviewLandmark::LLPreviewLandmark(const std::string& name,
 {
         
         mFactoryMap["place_details_panel"] = LLCallbackMap(LLPreviewLandmark::createPlaceDetail, this);
-        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_existing_landmark.xml", &getFactoryMap());
+        if (show_keep_discard)
+        {
+                LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_new_landmark.xml", &getFactoryMap());
+                childSetAction("Discard btn",onDiscardBtn,this);
+        }
+        else
+        {
+                LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_existing_landmark.xml", &getFactoryMap());
+        }
 
         /*
         childSetCommitCallback("desc_editor", LLPreview::onText, this);
diff --git a/linden/indra/newview/llpreviewsound.cpp b/linden/indra/newview/llpreviewsound.cpp
index 9ba6fd5..6b79bfb 100644
--- a/linden/indra/newview/llpreviewsound.cpp
+++ b/linden/indra/newview/llpreviewsound.cpp
@@ -106,7 +106,6 @@ void LLPreviewSound::auditionSound( void *userdata )
         if(item && gAudiop)
         {
                 LLVector3d lpos_global = gAgent.getPositionGlobal();
-                F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : SOUND_GAIN * gSavedSettings.getF32("AudioLevelSFX");
-                gAudiop->triggerSound(item->getAssetUUID(), gAgent.getID(), volume, lpos_global);
+                gAudiop->triggerSound(item->getAssetUUID(), gAgent.getID(), SOUND_GAIN, LLAudioEngine::AUDIO_TYPE_UI, lpos_global);
         }
 }
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 6371f2b..c863d19 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -45,6 +45,10 @@
 # include "audioengine_fmod.h"
 #endif
 
+#ifdef LL_OPENAL
+#include "audioengine_openal.h"
+#endif
+
 #include "llares.h"
 #include "llcachename.h"
 #include "llviewercontrol.h"
@@ -579,10 +583,28 @@ bool idle_startup()
 
                 if (FALSE == gSavedSettings.getBOOL("NoAudio"))
                 {
-#ifdef LL_FMOD
-                        gAudiop = (LLAudioEngine *) new LLAudioEngine_FMOD();
-#else
                         gAudiop = NULL;
+
+#ifdef LL_OPENAL
+                        if (!gAudiop
+#if !LL_WINDOWS
+                            && NULL == getenv("LL_BAD_OPENAL_DRIVER")
+#endif // !LL_WINDOWS
+                            )
+                        {
+                                gAudiop = (LLAudioEngine *) new LLAudioEngine_OpenAL();
+                        }
+#endif
+
+#ifdef LL_FMOD                  
+                        if (!gAudiop
+#if !LL_WINDOWS
+                            && NULL == getenv("LL_BAD_FMOD_DRIVER")
+#endif // !LL_WINDOWS
+                            )
+                        {
+                                gAudiop = (LLAudioEngine *) new LLAudioEngine_FMOD();
+                        }
 #endif
 
                         if (gAudiop)
@@ -595,15 +617,21 @@ bool idle_startup()
                                 void* window_handle = NULL;
 #endif
                                 bool init = gAudiop->init(kAUDIO_NUM_SOURCES, window_handle);
-                                if(!init)
+                                if(init)
+                                {
+                                        gAudiop->setMuted(TRUE);
+                                }
+                                else
                                 {
                                         LL_WARNS("AppInit") << "Unable to initialize audio engine" << LL_ENDL;
+                                        delete gAudiop;
+                                        gAudiop = NULL;
                                 }
-                                gAudiop->setMuted(TRUE);
                         }
                 }
                 
                 LL_INFOS("AppInit") << "Audio Engine Initialized." << LL_ENDL;
+
                 
                 if (LLTimer::knownBadTimer())
                 {
@@ -750,6 +778,12 @@ bool idle_startup()
                 gLoginMenuBarView->setVisible( TRUE );
                 gLoginMenuBarView->setEnabled( TRUE );
 
+                // DEV-16927.  The following code removes errant keystrokes that happen while the window is being 
+                // first made visible.
+#ifdef _WIN32
+                MSG msg;
+                while( PeekMessage( &msg, /*All hWnds owned by this thread */ NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE ) );
+#endif
                 timeout.reset();
                 return FALSE;
         }
diff --git a/linden/indra/newview/llvieweraudio.cpp b/linden/indra/newview/llvieweraudio.cpp
index 122a0bc..bc25649 100644
--- a/linden/indra/newview/llvieweraudio.cpp
+++ b/linden/indra/newview/llvieweraudio.cpp
@@ -62,7 +62,7 @@ void init_audio()
 
 // load up our initial set of sounds we'll want so they're in memory and ready to be played
 
-        BOOL mute_audio = gSavedSettings.getBOOL("MuteAudio");
+        bool mute_audio = gSavedSettings.getBOOL("MuteAudio");
 
         if (!mute_audio && FALSE == gSavedSettings.getBOOL("NoPreload"))
         {
@@ -114,7 +114,9 @@ void init_audio()
 void audio_update_volume(bool force_update)
 {
         F32 master_volume = gSavedSettings.getF32("AudioLevelMaster");
-        BOOL mute_audio = gSavedSettings.getBOOL("MuteAudio");
+        bool wind_muted = gSavedSettings.getBOOL("MuteWind");
+        bool mute_audio = gSavedSettings.getBOOL("MuteAudio");
+
         if (!gViewerWindow->getActive() && (gSavedSettings.getBOOL("MuteWhenMinimized")))
         {
                 mute_audio = TRUE;
@@ -129,9 +131,9 @@ void audio_update_volume(bool force_update)
                 gAudiop->setDopplerFactor(gSavedSettings.getF32("AudioLevelDoppler"));
                 gAudiop->setDistanceFactor(gSavedSettings.getF32("AudioLevelDistance")); 
                 gAudiop->setRolloffFactor(gSavedSettings.getF32("AudioLevelRolloff"));
-#ifdef kAUDIO_ENABLE_WIND
+
+                if(wind_muted == false)
                 gAudiop->enableWind(!mute_audio);
-#endif
 
                 gAudiop->setMuted(mute_audio);
                 
@@ -197,46 +199,50 @@ void audio_update_listener()
 
 void audio_update_wind(bool force_update)
 {
-#ifdef kAUDIO_ENABLE_WIND
-        //
-        //  Extract height above water to modulate filter by whether above/below water 
-        // 
-        LLViewerRegion* region = gAgent.getRegion();
-        if (region)
+        bool wind_muted = gSavedSettings.getBOOL("MuteWind");
+        bool mute_audio = gSavedSettings.getBOOL("MuteAudio");
+
+        if(!mute_audio && !wind_muted)
         {
-                static F32 last_camera_water_height = -1000.f;
-                LLVector3 camera_pos = gAgent.getCameraPositionAgent();
-                F32 camera_water_height = camera_pos.mV[VZ] - region->getWaterHeight();
-                
                 //
-                //  Don't update rolloff factor unless water surface has been crossed
-                //
-                if (force_update || (last_camera_water_height * camera_water_height) < 0.f)
+                //  Extract height above water to modulate filter by whether above/below water 
+                // 
+                LLViewerRegion* region = gAgent.getRegion();
+                if (region)
                 {
-                        if (camera_water_height < 0.f)
-                        {
-                                gAudiop->setRolloffFactor(gSavedSettings.getF32("AudioLevelRolloff") * LL_ROLLOFF_MULTIPLIER_UNDER_WATER);
-                        }
-                        else 
+                        static F32 last_camera_water_height = -1000.f;
+                        LLVector3 camera_pos = gAgent.getCameraPositionAgent();
+                        F32 camera_water_height = camera_pos.mV[VZ] - region->getWaterHeight();
+                        
+                        //
+                        //  Don't update rolloff factor unless water surface has been crossed
+                        //
+                        if (force_update || (last_camera_water_height * camera_water_height) < 0.f)
                         {
-                                gAudiop->setRolloffFactor(gSavedSettings.getF32("AudioLevelRolloff"));
+                                if (camera_water_height < 0.f)
+                                {
+                                        gAudiop->setRolloffFactor(gSavedSettings.getF32("AudioLevelRolloff") * LL_ROLLOFF_MULTIPLIER_UNDER_WATER);
+                                }
+                                else 
+                                {
+                                        gAudiop->setRolloffFactor(gSavedSettings.getF32("AudioLevelRolloff"));
+                                }
                         }
+                        // this line rotates the wind vector to be listener (agent) relative
+                        // unfortunately we have to pre-translate to undo the translation that
+                        // occurs in the transform call
+                        gRelativeWindVec = gAgent.getFrameAgent().rotateToLocal(gWindVec - gAgent.getVelocity());
+
+                        // don't use the setter setMaxWindGain() because we don't
+                        // want to screw up the fade-in on startup by setting actual source gain
+                        // outside the fade-in.
+                        F32 ambient_volume = gSavedSettings.getF32("AudioLevelAmbient");
+                        gAudiop->mMaxWindGain = gSavedSettings.getBOOL("MuteAmbient") 
+                                ? 0.f 
+                                : ambient_volume * ambient_volume;
+                        
+                        last_camera_water_height = camera_water_height;
+                        gAudiop->updateWind(gRelativeWindVec, camera_water_height);
                 }
-                // this line rotates the wind vector to be listener (agent) relative
-                // unfortunately we have to pre-translate to undo the translation that
-                // occurs in the transform call
-                gRelativeWindVec = gAgent.getFrameAgent().rotateToLocal(gWindVec - gAgent.getVelocity());
-
-                // don't use the setter setMaxWindGain() because we don't
-                // want to screw up the fade-in on startup by setting actual source gain
-                // outside the fade-in.
-                F32 ambient_volume = gSavedSettings.getF32("AudioLevelAmbient");
-                gAudiop->mMaxWindGain = gSavedSettings.getBOOL("MuteAmbient") 
-                        ? 0.f 
-                        : ambient_volume * ambient_volume;
-                
-                last_camera_water_height = camera_water_height;
-                gAudiop->updateWind(gRelativeWindVec, camera_water_height);
         }
-#endif
 }
diff --git a/linden/indra/newview/llvieweraudio.h b/linden/indra/newview/llvieweraudio.h
index 6ab7c7f..b4a299c 100644
--- a/linden/indra/newview/llvieweraudio.h
+++ b/linden/indra/newview/llvieweraudio.h
@@ -32,8 +32,6 @@
 #ifndef LL_VIEWERAUDIO_H
 #define LL_VIEWERAUDIO_H
 
-// comment out to turn off wind
-#define kAUDIO_ENABLE_WIND 
 //#define kAUDIO_ENABLE_WATER 1 // comment out to turn off water
 #define kAUDIO_NUM_BUFFERS 30
 #define kAUDIO_NUM_SOURCES 30 
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 0e39026..28ca198 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -833,9 +833,9 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
                 //if we are throttled, don't display them - Gigs
                 if (check_offer_throttle(from_name, false))
                 {
-                        // I'm not sure this is a good idea.  JC
-                        bool show_keep_discard = item->getPermissions().getCreator() != gAgent.getID();
-                        //bool show_keep_discard = true;
+                        // I'm not sure this is a good idea.  JC  -  Definitely a bad idea.  HB
+                        //bool show_keep_discard = item->getPermissions().getCreator() != gAgent.getID();
+                        bool show_keep_discard = true;
                         switch(asset_type)
                         {
                         case LLAssetType::AT_NOTECARD:
@@ -3308,8 +3308,7 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
                 return;
         }
 
-        F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : (gain * gSavedSettings.getF32("AudioLevelSFX"));
-        gAudiop->triggerSound(sound_id, owner_id, volume, pos_global);
+        gAudiop->triggerSound(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX, pos_global);
 }
 
 void process_preload_sound(LLMessageSystem *msg, void **user_data)
diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 8a55b3f..1dda1ca 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -1402,8 +1402,7 @@ void LLViewerTextEditor::openEmbeddedSound( LLInventoryItem* item )
         const F32 SOUND_GAIN = 1.0f;
         if(gAudiop)
         {
-                F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : (SOUND_GAIN * gSavedSettings.getF32("AudioLevelSFX"));
-                gAudiop->triggerSound(item->getAssetUUID(), gAgentID, volume, lpos_global);
+                gAudiop->triggerSound(item->getAssetUUID(), gAgentID, SOUND_GAIN, LLAudioEngine::AUDIO_TYPE_UI, lpos_global);
         }
         showCopyToInvDialog( item );
 }
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index e480eb3..327cd57 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3828,10 +3828,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
 //                                                      AUDIO_STEP_LO_SPEED, AUDIO_STEP_HI_SPEED,
 //                                                      AUDIO_STEP_LO_GAIN, AUDIO_STEP_HI_GAIN );
 
-                        F32 ambient_volume = gSavedSettings.getF32("AudioLevelAmbient");
-                        F32 gain = gSavedSettings.getBOOL("MuteAmbient") 
-                                ? 0.f 
-                                : (.50f * ambient_volume * ambient_volume);
+                        const F32 STEP_VOLUME = 0.5f;
                         LLUUID& step_sound_id = getStepSound();
 
                         LLVector3d foot_pos_global = gAgent.getPosGlobalFromAgent(foot_pos_agent);
@@ -3839,7 +3836,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
                         if (LLViewerParcelMgr::getInstance()->canHearSound(foot_pos_global)
                                 && !LLMuteList::getInstance()->isMuted(getID(), LLMute::flagObjectSounds))
                         {
-                                gAudiop->triggerSound(step_sound_id, getID(), gain, foot_pos_global);
+                                gAudiop->triggerSound(step_sound_id, getID(), STEP_VOLUME, LLAudioEngine::AUDIO_TYPE_AMBIENT, foot_pos_global);
                         }
                 }
         }
@@ -4819,8 +4816,8 @@ BOOL LLVOAvatar::processSingleAnimationStateChange( const LLUUID& anim_id, BOOL
                                         //else
                                         {
                                                 LLUUID sound_id = LLUUID(gSavedSettings.getString("UISndTyping"));
-                                                F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : gSavedSettings.getF32("AudioLevelSFX");
-                                                gAudiop->triggerSound(sound_id, getID(), volume, char_pos_global);
+                                                gAudiop->triggerSound(sound_id, getID(), 1.0f, LLAudioEngine::AUDIO_TYPE_SFX, char_pos_global);
+
                                         }
                                 }
                         }
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index c2d4301..dc9b5ea 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -385,6 +385,73 @@ Go to the Second Life web site for more information on partnering?
                         Cancel
                 </option>
         </alert>
+  <alert modal="true" name="ClickBuildConstants">
+    <message name="message">
+      The following constants are accepted in this tab:
+
+      XP  --  X-axis position
+      YP  --  Y-axis position
+      ZP  --  Z-axis position
+      XS  --  X-axis size
+      YS  --  Y-axis size
+      ZS  --  Z-axis size
+      XR  --  X-axis rotation
+      YR  --  Y-axis rotation
+      ZR  --  Z-axis rotation
+      CB  --  Path cut begin
+      CE  --  Path cut end
+      HLW  --  Hollow size
+      SKW  --  Skew
+      PB  --  Slice/Dimple/Profile cut begin
+      PE  --  Slice/Dimple/Profile cut end
+      XSH  --  X-axis top shear
+      YSH  --  Y-axis top shear
+      XHL  --  X-axis hole size
+      YHL  --  Y-axis hole size
+      XTP  --  X-axis taper
+      YTP  --  Y-axis taper
+      ROF  --  Radius offset
+      REV  --  Revolutions
+
+      *  --  Multiplication
+      \  --  Division
+      +  --  Addition
+      -  --  Subtraction
+
+      Examples:
+
+      * Enter &apos;ZP + 20&apos; in the Z-axis position field
+      to move an object up 20 meters.
+      * Enter &apos;XS - YS&apos; in the X-axis size field
+      to subtract the Y size from the X size.
+    </message>
+  </alert>
+  <alert modal="true" name="ClickTextureConstants">
+    <message name="message">
+      The following constants are accepted in this tab:
+
+      TSU  --  Repeats per face (horizontal)
+      TSV  --  Repeats per face (vertical)
+      TOU  --  Offsets per face (horizontal)
+      TOV  --  Offsets per face (vertical)
+      TRNS --  Transparency
+      TROT --  Texture rotation
+      GLOW --  Glow
+
+      *  --  Multiplication
+      \  --  Division
+      +  --  Addition
+      -  --  Subtraction
+
+      Examples:
+
+      * Enter &apos;TSU * 4&apos; in horizantal repeats field
+      to increase the amount of repeats by 4x.
+      * Enter &apos;TSV&apos; in the horizontal repeats field
+      to make the horizontal and vertical
+      repeats match.
+    </message>
+  </alert>
         <alert modal="true" name="ClickWebProfileHelpAvatar">
                 <message name="message">
                         If this Resident has set a web profile URL then you can:
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index be18c7e..72c92bd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -1,82 +1,82 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater border="true" bottom="-297" can_close="true" can_drag_on_left="false"

-     can_minimize="true" can_resize="true" default_tab_group="1" enabled="true"

-     follows="left|top|right|bottom" height="296" label="(unknown)" left="1"

-     min_height="200" min_width="360" mouse_opaque="true" name="im_floater"

-     rect_control="" title="(unknown)" width="501">

-        <string name="ringing">

-                Joining Voice Chat...

-        </string>

-        <string name="connected">

-                Connected, click End Call to hang up

-        </string>

-        <string name="hang_up">

-                Left Voice Chat

-        </string>

-        <string name="voice_icon">

-                icn_voice-groupfocus.tga

-        </string>

-        <string name="live_help_dialog" wordwrap="false">

-                *** Welcome to Help Request *** 

-        Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/ 

-        If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.

-        -=-=- Response times will vary, especially during peak times -=-=-

-        </string>

-        <string name="title_string">

-                Instant Message with [NAME]

-        </string>

-        <string name="typing_start_string">

-                [NAME] is typing...

-        </string>

-        <string name="session_start_string">

-                Starting session with [NAME], please wait.

-        </string>

-        <string name="moderated_chat_label">

-                (Moderated: Voices off by default)

-        </string>

-        <string name="default_text_label">

-                Click here to instant message.

-        </string>

-        <string name="muted_text_label">

-                Your text chat has been disabled by a Group Moderator.

-        </string>

-        <layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="276" left="0"

-             orientation="horizontal" tab_group="1" width="495" name="panels">

-                <layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right"

-                     height="130" left="0" min_width="210" name="im_contents_panel" width="175">

-                        <button bottom="-20" follows="left|top" height="20" label="Group Info" left="5"

-                             name="group_info_btn" tab_group="0" width="80" />

-                        <button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20"

-                             image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"

-                             label="Join Call" left_delta="85" name="start_call_btn" pad_right="12"

-                             width="80" />

-                        <button bottom_delta="0" follows="left|top" halign="right" height="20"

-                             image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"

-                             label="End Call" left_delta="0" name="end_call_btn" pad_right="12"

-                             visible="false" width="80" />

-                        <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"

-                             label_selected="&gt; &gt;" left="143" name="toggle_active_speakers_btn"

-                             right="176"

-                             tool_tip="Click here to toggle a list of active participants in this IM session."

-                             visible="true" width="30" />

-                        <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"

-                             bottom="30" embedded_items="false" enabled="false"

-                             follows="left|top|right|bottom" font="SansSerif" left="4"

-                             max_length="2147483647" mouse_opaque="true" name="im_history"

-                             text_color="ChatHistoryTextColor"

-                             text_readonly_color="ChatHistoryTextColor" top="104" width="170"

-                             word_wrap="true" />

-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"

-                             enabled="true" follows="left|right|bottom" font="SansSerif" height="20"

-                             left="5" max_length="1022" mouse_opaque="true" name="chat_editor"

-                             select_all_on_focus_received="false" select_on_focus="false" tab_group="1"

-                             width="106" />

-                        <button bottom="7" enabled="true" follows="right|bottom" font="SansSerif"

-                             halign="center" height="20" label="Send" left="116" mouse_opaque="true"

-                             name="send_btn" scale_image="true" width="60" />

-                </layout_panel>

-                <layout_panel auto_resize="false" bottom="0" can_resize="true"

-                     filename="panel_speaker_controls.xml" height="120" left="0" min_width="140"

-                     name="active_speakers_panel" top_delta="0" visible="false" width="140" />

-        </layout_stack>

-</floater>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater border="true" bottom="-297" can_close="true" can_drag_on_left="false"
+     can_minimize="true" can_resize="true" default_tab_group="1" enabled="true"
+     follows="left|top|right|bottom" height="296" label="(unknown)" left="1"
+     min_height="200" min_width="360" mouse_opaque="true" name="im_floater"
+     rect_control="" title="(unknown)" width="501">
+        <string name="ringing">
+                Joining Voice Chat...
+        </string>
+        <string name="connected">
+                Connected, click End Call to hang up
+        </string>
+        <string name="hang_up">
+                Left Voice Chat
+        </string>
+        <string name="voice_icon">
+                icn_voice-groupfocus.tga
+        </string>
+        <string name="live_help_dialog" wordwrap="false">
+                *** Welcome to Help Request *** 
+        Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/ 
+        If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.
+        -=-=- Response times will vary, especially during peak times -=-=-
+        </string>
+        <string name="title_string">
+                Instant Message with [NAME]
+        </string>
+        <string name="typing_start_string">
+                [NAME] is typing...
+        </string>
+        <string name="session_start_string">
+                Starting session with [NAME], please wait.
+        </string>
+        <string name="moderated_chat_label">
+                (Moderated: Voices off by default)
+        </string>
+        <string name="default_text_label">
+                Click here to instant message.
+        </string>
+        <string name="muted_text_label">
+                Your text chat has been disabled by a Group Moderator.
+        </string>
+        <layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="276" left="0"
+             orientation="horizontal" tab_group="1" width="495" name="panels">
+                <layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right"
+                     height="130" left="0" min_width="210" name="im_contents_panel" width="175">
+                        <button bottom="-20" follows="left|top" height="20" label="Group Info" left="5"
+                             name="group_info_btn" tab_group="0" width="80" />
+                        <button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20"
+                             image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
+                             label="Join Call" left_delta="85" name="start_call_btn" pad_right="12"
+                             width="80" />
+                        <button bottom_delta="0" follows="left|top" halign="right" height="20"
+                             image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
+                             label="End Call" left_delta="0" name="end_call_btn" pad_right="12"
+                             visible="false" width="80" />
+                        <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
+                             label_selected="&gt; &gt;" left="143" name="toggle_active_speakers_btn"
+                             right="176"
+                             tool_tip="Click here to toggle a list of active participants in this IM session."
+                             visible="true" width="30" />
+                        <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
+                             bottom="30" embedded_items="false" enabled="false"
+                             follows="left|top|right|bottom" font="SansSerif" left="4"
+                             max_length="2147483647" mouse_opaque="true" name="im_history"
+                             text_color="ChatHistoryTextColor"
+                             text_readonly_color="ChatHistoryTextColor" top="104" width="170"
+                             word_wrap="true" />
+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
+                             enabled="true" follows="left|right|bottom" font="SansSerif" height="20"
+                             left="5" max_length="1022" mouse_opaque="true" name="chat_editor"
+                             select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
+                             width="106" />
+                        <button bottom="7" enabled="true" follows="right|bottom" font="SansSerif"
+                             halign="center" height="20" label="Send" left="116" mouse_opaque="true"
+                             name="send_btn" scale_image="true" width="60" />
+                </layout_panel>
+                <layout_panel auto_resize="false" bottom="0" can_resize="true"
+                     filename="panel_speaker_controls.xml" height="120" left="0" min_width="140"
+                     name="active_speakers_panel" top_delta="0" visible="false" width="140" />
+        </layout_stack>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 742da45..eb9b1c6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -587,7 +587,10 @@
                              mouse_opaque="true" name="edit_object" v_pad="0" width="252">
                                 Edit object parameters:
                         </text>
-                        <check_box bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="16"
+      <button bottom_delta="-10" follows="left|top" font="SansSerif" halign="center"
+                             height="22" label="?" label_selected="?" right="-8" tool_tip="Object math constants" 
+                             mouse_opaque="true" name="build_math_constants" scale_image="true" width="22" />
+                        <check_box bottom_delta="-16" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Locked" left="8" mouse_opaque="true"
                              name="checkbox locked"
                              tool_tip="Prevents object from being moved or deleted. Frequently useful during building to avoid unintended edits."
@@ -614,15 +617,15 @@
                         <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="X" label_width="10" left="10"
                              max_val="512" min_val="-256" mouse_opaque="true" name="Pos X"
-                             text_enabled_color="110, 15, 15, 255" width="87" />
+                             text_enabled_color="110, 15, 15, 255" width="96" />
                         <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
                              max_val="512" min_val="-256" mouse_opaque="true" name="Pos Y"
-                             text_enabled_color="0, 100, 40, 255" width="87" />
+                             text_enabled_color="0, 100, 40, 255" width="96" />
                         <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
                              max_val="4096" min_val="0" mouse_opaque="true" name="Pos Z"
-                             text_enabled_color="0, 67, 132, 255" width="87" />
+                             text_enabled_color="0, 67, 132, 255" width="96" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
@@ -632,15 +635,15 @@
                         <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="X" label_width="10" left="10"
                              max_val="10" min_val="0.01" mouse_opaque="true" name="Scale X"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
+                             text_enabled_color="1, 1, 1, 1" width="96" />
                         <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
                              max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Y"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
+                             text_enabled_color="1, 1, 1, 1" width="96" />
                         <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
                              max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Z"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
+                             text_enabled_color="1, 1, 1, 1" width="96" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
@@ -650,15 +653,15 @@
                         <spinner bottom_delta="-22" decimal_digits="2" follows="left|top" height="16"
                              increment="1" initial_val="0" label="X" label_width="10" left="10"
                              max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot X"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
+                             text_enabled_color="1, 1, 1, 1" width="96" />
                         <spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
                              increment="1" initial_val="0" label="Y" label_width="10" left="10"
                              max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Y"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
+                             text_enabled_color="1, 1, 1, 1" width="96" />
                         <spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
                              increment="1" initial_val="0" label="Z" label_width="10" left="10"
                              max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Z"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
+                             text_enabled_color="1, 1, 1, 1" width="96" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
@@ -748,12 +751,12 @@
                                 Skew
                         </text>
                         <spinner bottom_delta="-20" decimal_digits="1" follows="left|top" height="16"
-                             increment="5" initial_val="0" left="121" max_val="95" min_val="0"
-                             mouse_opaque="true" name="Scale 1" width="68" />
-                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" left_delta="73" max_val="0.95"
-                             min_val="-0.95" mouse_opaque="true" name="Skew" width="68" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             increment="5" initial_val="0" left="121" max_val="95" min_val="0" 
+                             mouse_opaque="true" name="Scale 1" width="68" label=" " label_width="10"/>
+      <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
+                             increment="0.05" initial_val="0" left_delta="73" max_val="0.95" label_width="10"
+                             min_val="-0.95" mouse_opaque="true" name="Skew" width="68" label=" " />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-15" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
                              mouse_opaque="true" name="Hollow Shape" v_pad="0" width="141">
@@ -872,10 +875,10 @@
                         </text>
                         <spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
                              increment="0.05" initial_val="0" left="121" max_val="1" min_val="-1"
-                             mouse_opaque="true" name="Radius Offset" width="68" />
-                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
+                             mouse_opaque="true" name="Radius Offset" width="68" label=" " label_width="10" />
+      <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
                              increment="0.1" initial_val="1" left_delta="73" max_val="4" min_val="1"
-                             mouse_opaque="true" name="Revolutions" width="68" />
+                             mouse_opaque="true" name="Revolutions" width="68" label=" " label_width="10" />
                         <texture_picker allow_no_texture="false" bottom="-211" can_apply_immediately="true"
                              default_image_name="Default" follows="left|top" height="141"
                              label="Sculpt Texture" left="121" mouse_opaque="true"
@@ -1018,7 +1021,7 @@
                         </text>
                         <spinner bottom_delta="-20" decimal_digits="0" follows="left|top" height="16"
                              increment="2" initial_val="0" left="180" max_val="100" min_val="0"
-                             mouse_opaque="true" name="ColorTrans" width="80" />
+                             mouse_opaque="true" name="ColorTrans" width="58" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10"
@@ -1027,7 +1030,7 @@
                         </text>
                         <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
                              increment="0.1" initial_val="0" left="180" max_val="1"
-                             min_val="0" mouse_opaque="true" name="glow" width="80" />
+                             min_val="0" mouse_opaque="true" name="glow" width="58" />
                         <check_box bottom_delta="-23" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Full Bright" left="180" mouse_opaque="true"
                              name="checkbox fullbright" width="81" />
@@ -1201,6 +1204,9 @@
                         <button bottom="-360" follows="left|top" font="SansSerifSmall" halign="center"
                              height="16" label="Align" label_selected="Align" left="112"
                              mouse_opaque="true" name="button align" scale_image="TRUE" width="68" />
+      <button bottom="-162" follows="left|top" font="SansSerif" halign="center"
+                             height="22" label="?" label_selected="?" right="-8" tool_tip="Texture math constants"
+                             mouse_opaque="true" name="texture_math_constants" scale_image="true" width="24" />
                 </panel>
                 <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
                      label="Content" left="1" mouse_opaque="false" name="Contents" width="270">
diff --git a/linden/indra/newview/skins/default/xui/en-us/strings.xml b/linden/indra/newview/skins/default/xui/en-us/strings.xml
index e8c341e..dd73f20 100644
--- a/linden/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/strings.xml
@@ -1,180 +1,180 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<!-- This file contains strings that used to be hardcoded in the source.

-     It is only for those strings which don't belong in a floater.

-     For example, the strings used in avatar chat bubbles, and strings 

-     that are returned from one component and may appear in many places-->

-<strings>

-        

-        <!-- Login -->

-        <string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen.  Please wait.</string>

-        <string name="LoginAuthenticating">Authenticating</string>

-        <string name="LoginMaintenance">Performing account maintenance...</string>

-        <string name="LoginAttempt">Previous login attempt failed. Logging in, attempt [NUMBER]</string>

-        <string name="LoginPrecaching">Loading world...</string>

-        <string name="LoginInitializingBrowser">Initializing embedded web browser...</string>

-        <string name="LoginInitializingMultimedia">Initializing multimedia...</string>

-        <string name="LoginVerifyingCache">Verifying cache files (can take 60-90 seconds)...</string>

-        <string name="LoginProcessingResponse">Processing Response...</string>

-        <string name="LoginInitializingWorld">Initializing World...</string>

-        <string name="LoginDecodingImages">Decoding images...</string>

-        <string name="LoginInitializingQuicktime">Initializing QuickTime...</string>

-        <string name="LoginQuicktimeNotFound">QuickTime not found - unable to initialize.</string>

-        <string name="LoginQuicktimeOK">QuickTime initialized successfully.</string>

-        <string name="LoginWaitingForRegionHandshake">Waiting for region handshake...</string>

-        <string name="LoginConnectingToRegion">Connecting to region...</string>

-        <string name="LoginDownloadingClothing">Downloading clothing...</string>

-  <string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string>

-

-

-        <!-- Disconnection -->

-        <string name="AgentLostConnection">This region may be experiencing trouble.  Please check your connection to the Internet.</string>

-        

-        

-        <!-- Tooltip, llhoverview.cpp -->

-        <string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->

-        <string name="TooltipNoName">(no name)</string> <!-- No name on an object -->

-        <string name="TooltipOwner">Owner:</string> <!-- Owner name follows -->

-        <string name="TooltipPublic">Public</string> <!-- Public permissions on an object -->

-        <string name="TooltipIsGroup">(Group)</string> <!-- The name before this text is that of a group -->

-        <string name="TooltipFlagScript">Script</string>

-        <string name="TooltipFlagPhysics">Physics</string>

-        <string name="TooltipFlagTouch">Touch</string>

-        <string name="TooltipFlagL$">L$</string>

-        <string name="TooltipFlagDropInventory">Drop Inventory</string>

-        <string name="TooltipFlagPhantom">Phantom</string>

-        <string name="TooltipFlagTemporary">Temporary</string>

-        <string name="TooltipFlagRightClickMenu">(Right-click for menu)</string>

-        <string name="TooltipFreeToCopy">Free to copy</string>

-        <string name="TooltipForSaleL$">For Sale: L$[AMOUNT]</string> <!-- L$ version -->

-        <string name="TooltipForSaleMsg">For Sale: [MESSAGE]</string> <!-- Message (RetrievingData) -->

-        <string name="TooltipFlagGroupBuild">Group Build</string>

-        <string name="TooltipFlagNoBuild">No Build</string>

-        <string name="TooltipFlagNoEdit">Group Build</string>

-        <string name="TooltipFlagNotSafe">Not Safe</string><!-- damage area -->

-        <string name="TooltipFlagNoFly">No Fly</string>

-        <string name="TooltipFlagGroupScripts">Group Scripts</string>

-        <string name="TooltipFlagNoScripts">No Scripts</string>

-        <string name="TooltipLand">Land:</string>

-        <string name="TooltipMustSingleDrop">Only a single item can be dragged here</string>    

-

-        

-        <!-- Indicates that an avatar's name or other similar datum is being retrieved. General usage. -->

-        <string name="RetrievingData">Retrieving...</string>

-

-        <string name="ReleaseNotes">Release Notes</string>

-

-        <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->

-        <string name="LoadingData">Loading...</string>

-        

-        

-        <!-- namecache -->

-        <!-- Avatar name: text shown for LLUUID::null -->

-        <string name="AvatarNameNobody">(nobody)</string>

-        

-        <!-- Avatar name: text shown while fetching name -->

-        <string name="AvatarNameWaiting">(waiting)</string>

-

-        <!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. -->

-        <string name="AvatarNameHippos">(hippos)</string>

-        

-        <!-- Group name: text shown for LLUUID::null -->

-        <string name="GroupNameNone">(none)</string>

-        

-        <!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->

-        <string name="AssetErrorNone">No error</string>

-        <string name="AssetErrorRequestFailed">Asset request: failed</string>

-        <string name="AssetErrorNonexistentFile">Asset request: non-existent file</string>

-        <string name="AssetErrorNotInDatabase">Asset request: asset not found in database</string>

-        <string name="AssetErrorEOF">End of file</string>

-        <string name="AssetErrorCannotOpenFile">Cannot open file</string>

-        <string name="AssetErrorFileNotFound">File not found</string>

-        <string name="AssetErrorTCPTimeout">File transfer timeout</string>

-        <string name="AssetErrorCircuitGone">Circuit gone</string>

-        <string name="AssetErrorUnknownStatus">Unknown status</string>

-        

-        <!-- llvoavatar. Displayed in the avatar's chat bubble -->

-        <string name="AvatarEditingApparance">(Editing Appearance)</string>

-        <string name="AvatarAway">Away</string>

-        <string name="AvatarBusy">Busy</string>

-        <string name="AvatarMuted">Muted</string>

-

-        <!-- animations -->

-        <string name="anim_express_afraid">Afraid</string>

-        <string name="anim_express_anger">Angry</string>

-        <string name="anim_away">Away</string>

-        <string name="anim_backflip">Backflip</string>

-        <string name="anim_express_laugh">Belly Laugh</string>

-        <string name="anim_express_toothsmile">BigSmile</string>

-        <string name="anim_blowkiss">Blow Kiss</string>

-        <string name="anim_express_bored">Bored</string>

-        <string name="anim_bow">Bow</string>

-        <string name="anim_clap">Clap</string>

-        <string name="anim_courtbow">Court Bow</string>

-        <string name="anim_express_cry">Cry</string>

-        <string name="anim_dance1">Dance 1</string>

-        <string name="anim_dance2">Dance 2</string>

-        <string name="anim_dance3">Dance 3</string>

-        <string name="anim_dance4">Dance 4</string>

-        <string name="anim_dance5">Dance 5</string>

-        <string name="anim_dance6">Dance 6</string>

-        <string name="anim_dance7">Dance 7</string>

-        <string name="anim_dance8">Dance 8</string>

-        <string name="anim_express_disdain">Disdain</string>

-        <string name="anim_drink">Drink</string>

-        <string name="anim_express_embarrased">Embarrassed</string>

-        <string name="anim_angry_fingerwag">Finger Wag</string>

-        <string name="anim_fist_pump">Fist Pump</string>

-        <string name="anim_yoga_float">Floating Yoga</string>

-        <string name="anim_express_frown">Frown</string>

-        <string name="anim_impatient">Impatient</string>

-        <string name="anim_jumpforjoy">Jump For Joy</string>

-        <string name="anim_kissmybutt">Kiss My Butt</string>

-        <string name="anim_express_kiss">Kiss</string>

-        <string name="anim_laugh_short">Laugh</string>

-        <string name="anim_musclebeach">Muscle Beach</string>

-        <string name="anim_no_unhappy">No (Unhappy)</string>

-        <string name="anim_no_head">No</string>

-        <string name="anim_nyanya">Nya-nya-nya</string>

-        <string name="anim_punch_onetwo">One-Two Punch</string>

-        <string name="anim_express_open_mouth">Open Mouth</string>

-        <string name="anim_peace">Peace</string>

-        <string name="anim_point_you">Point at Other</string>

-        <string name="anim_point_me">Point at Self</string>

-        <string name="anim_punch_l">Punch Left</string>

-        <string name="anim_punch_r">Punch Right</string>

-        <string name="anim_rps_countdown">RPS count</string>

-        <string name="anim_rps_paper">RPS paper</string>

-        <string name="anim_rps_rock">RPS rock</string>

-        <string name="anim_rps_scissors">RPS scissors</string>

-        <string name="anim_express_repulsed">Repulsed</string>

-        <string name="anim_kick_roundhouse_r">Roundhouse Kick</string>

-        <string name="anim_express_sad">Sad</string>

-        <string name="anim_salute">Salute</string>

-        <string name="anim_shout">Shout</string>

-        <string name="anim_express_shrug">Shrug</string>

-        <string name="anim_express_smile">Smile</string>

-        <string name="anim_smoke_idle">Smoke Idle</string>

-        <string name="anim_smoke_inhale">Smoke Inhale</string>

-        <string name="anim_smoke_throw_down">Smoke Throw Down</string>

-        <string name="anim_express_surprise">Surprise</string>

-        <string name="anim_sword_strike_r">Sword Strike</string>

-        <string name="anim_angry_tantrum">Tantrum</string>

-        <string name="anim_express_tongue_out">TongueOut</string>

-        <string name="anim_hello">Wave</string>

-        <string name="anim_whisper">Whisper</string>

-        <string name="anim_whistle">Whistle</string>

-        <string name="anim_express_wink">Wink</string>

-        <string name="anim_wink_hollywood">Wink (Hollywood)</string>

-        <string name="anim_express_worry">Worry</string>

-        <string name="anim_yes_happy">Yes (Happy)</string>

-        <string name="anim_yes_head">Yes</string>

-        

-        <string name="texture_loading">Loading...</string>

-        <string name="worldmap_offline">Offline</string>

-        

-        <!-- Chat -->

-        <string name="whisper">whispers:</string>

-        <string name="shout">shouts:</string>

-

-</strings>

-

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- This file contains strings that used to be hardcoded in the source.
+     It is only for those strings which don't belong in a floater.
+     For example, the strings used in avatar chat bubbles, and strings 
+     that are returned from one component and may appear in many places-->
+<strings>
+        
+        <!-- Login -->
+        <string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen.  Please wait.</string>
+        <string name="LoginAuthenticating">Authenticating</string>
+        <string name="LoginMaintenance">Performing account maintenance...</string>
+        <string name="LoginAttempt">Previous login attempt failed. Logging in, attempt [NUMBER]</string>
+        <string name="LoginPrecaching">Loading world...</string>
+        <string name="LoginInitializingBrowser">Initializing embedded web browser...</string>
+        <string name="LoginInitializingMultimedia">Initializing multimedia...</string>
+        <string name="LoginVerifyingCache">Verifying cache files (can take 60-90 seconds)...</string>
+        <string name="LoginProcessingResponse">Processing Response...</string>
+        <string name="LoginInitializingWorld">Initializing World...</string>
+        <string name="LoginDecodingImages">Decoding images...</string>
+        <string name="LoginInitializingQuicktime">Initializing QuickTime...</string>
+        <string name="LoginQuicktimeNotFound">QuickTime not found - unable to initialize.</string>
+        <string name="LoginQuicktimeOK">QuickTime initialized successfully.</string>
+        <string name="LoginWaitingForRegionHandshake">Waiting for region handshake...</string>
+        <string name="LoginConnectingToRegion">Connecting to region...</string>
+        <string name="LoginDownloadingClothing">Downloading clothing...</string>
+  <string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string>
+
+
+        <!-- Disconnection -->
+        <string name="AgentLostConnection">This region may be experiencing trouble.  Please check your connection to the Internet.</string>
+        
+        
+        <!-- Tooltip, llhoverview.cpp -->
+        <string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
+        <string name="TooltipNoName">(no name)</string> <!-- No name on an object -->
+        <string name="TooltipOwner">Owner:</string> <!-- Owner name follows -->
+        <string name="TooltipPublic">Public</string> <!-- Public permissions on an object -->
+        <string name="TooltipIsGroup">(Group)</string> <!-- The name before this text is that of a group -->
+        <string name="TooltipFlagScript">Script</string>
+        <string name="TooltipFlagPhysics">Physics</string>
+        <string name="TooltipFlagTouch">Touch</string>
+        <string name="TooltipFlagL$">L$</string>
+        <string name="TooltipFlagDropInventory">Drop Inventory</string>
+        <string name="TooltipFlagPhantom">Phantom</string>
+        <string name="TooltipFlagTemporary">Temporary</string>
+        <string name="TooltipFlagRightClickMenu">(Right-click for menu)</string>
+        <string name="TooltipFreeToCopy">Free to copy</string>
+        <string name="TooltipForSaleL$">For Sale: L$[AMOUNT]</string> <!-- L$ version -->
+        <string name="TooltipForSaleMsg">For Sale: [MESSAGE]</string> <!-- Message (RetrievingData) -->
+        <string name="TooltipFlagGroupBuild">Group Build</string>
+        <string name="TooltipFlagNoBuild">No Build</string>
+        <string name="TooltipFlagNoEdit">Group Build</string>
+        <string name="TooltipFlagNotSafe">Not Safe</string><!-- damage area -->
+        <string name="TooltipFlagNoFly">No Fly</string>
+        <string name="TooltipFlagGroupScripts">Group Scripts</string>
+        <string name="TooltipFlagNoScripts">No Scripts</string>
+        <string name="TooltipLand">Land:</string>
+        <string name="TooltipMustSingleDrop">Only a single item can be dragged here</string>    
+
+        
+        <!-- Indicates that an avatar's name or other similar datum is being retrieved. General usage. -->
+        <string name="RetrievingData">Retrieving...</string>
+
+        <string name="ReleaseNotes">Release Notes</string>
+
+        <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
+        <string name="LoadingData">Loading...</string>
+        
+        
+        <!-- namecache -->
+        <!-- Avatar name: text shown for LLUUID::null -->
+        <string name="AvatarNameNobody">(nobody)</string>
+        
+        <!-- Avatar name: text shown while fetching name -->
+        <string name="AvatarNameWaiting">(waiting)</string>
+
+        <!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. -->
+        <string name="AvatarNameHippos">(hippos)</string>
+        
+        <!-- Group name: text shown for LLUUID::null -->
+        <string name="GroupNameNone">(none)</string>
+        
+        <!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->
+        <string name="AssetErrorNone">No error</string>
+        <string name="AssetErrorRequestFailed">Asset request: failed</string>
+        <string name="AssetErrorNonexistentFile">Asset request: non-existent file</string>
+        <string name="AssetErrorNotInDatabase">Asset request: asset not found in database</string>
+        <string name="AssetErrorEOF">End of file</string>
+        <string name="AssetErrorCannotOpenFile">Cannot open file</string>
+        <string name="AssetErrorFileNotFound">File not found</string>
+        <string name="AssetErrorTCPTimeout">File transfer timeout</string>
+        <string name="AssetErrorCircuitGone">Circuit gone</string>
+        <string name="AssetErrorUnknownStatus">Unknown status</string>
+        
+        <!-- llvoavatar. Displayed in the avatar's chat bubble -->
+        <string name="AvatarEditingApparance">(Editing Appearance)</string>
+        <string name="AvatarAway">Away</string>
+        <string name="AvatarBusy">Busy</string>
+        <string name="AvatarMuted">Muted</string>
+
+        <!-- animations -->
+        <string name="anim_express_afraid">Afraid</string>
+        <string name="anim_express_anger">Angry</string>
+        <string name="anim_away">Away</string>
+        <string name="anim_backflip">Backflip</string>
+        <string name="anim_express_laugh">Belly Laugh</string>
+        <string name="anim_express_toothsmile">BigSmile</string>
+        <string name="anim_blowkiss">Blow Kiss</string>
+        <string name="anim_express_bored">Bored</string>
+        <string name="anim_bow">Bow</string>
+        <string name="anim_clap">Clap</string>
+        <string name="anim_courtbow">Court Bow</string>
+        <string name="anim_express_cry">Cry</string>
+        <string name="anim_dance1">Dance 1</string>
+        <string name="anim_dance2">Dance 2</string>
+        <string name="anim_dance3">Dance 3</string>
+        <string name="anim_dance4">Dance 4</string>
+        <string name="anim_dance5">Dance 5</string>
+        <string name="anim_dance6">Dance 6</string>
+        <string name="anim_dance7">Dance 7</string>
+        <string name="anim_dance8">Dance 8</string>
+        <string name="anim_express_disdain">Disdain</string>
+        <string name="anim_drink">Drink</string>
+        <string name="anim_express_embarrased">Embarrassed</string>
+        <string name="anim_angry_fingerwag">Finger Wag</string>
+        <string name="anim_fist_pump">Fist Pump</string>
+        <string name="anim_yoga_float">Floating Yoga</string>
+        <string name="anim_express_frown">Frown</string>
+        <string name="anim_impatient">Impatient</string>
+        <string name="anim_jumpforjoy">Jump For Joy</string>
+        <string name="anim_kissmybutt">Kiss My Butt</string>
+        <string name="anim_express_kiss">Kiss</string>
+        <string name="anim_laugh_short">Laugh</string>
+        <string name="anim_musclebeach">Muscle Beach</string>
+        <string name="anim_no_unhappy">No (Unhappy)</string>
+        <string name="anim_no_head">No</string>
+        <string name="anim_nyanya">Nya-nya-nya</string>
+        <string name="anim_punch_onetwo">One-Two Punch</string>
+        <string name="anim_express_open_mouth">Open Mouth</string>
+        <string name="anim_peace">Peace</string>
+        <string name="anim_point_you">Point at Other</string>
+        <string name="anim_point_me">Point at Self</string>
+        <string name="anim_punch_l">Punch Left</string>
+        <string name="anim_punch_r">Punch Right</string>
+        <string name="anim_rps_countdown">RPS count</string>
+        <string name="anim_rps_paper">RPS paper</string>
+        <string name="anim_rps_rock">RPS rock</string>
+        <string name="anim_rps_scissors">RPS scissors</string>
+        <string name="anim_express_repulsed">Repulsed</string>
+        <string name="anim_kick_roundhouse_r">Roundhouse Kick</string>
+        <string name="anim_express_sad">Sad</string>
+        <string name="anim_salute">Salute</string>
+        <string name="anim_shout">Shout</string>
+        <string name="anim_express_shrug">Shrug</string>
+        <string name="anim_express_smile">Smile</string>
+        <string name="anim_smoke_idle">Smoke Idle</string>
+        <string name="anim_smoke_inhale">Smoke Inhale</string>
+        <string name="anim_smoke_throw_down">Smoke Throw Down</string>
+        <string name="anim_express_surprise">Surprise</string>
+        <string name="anim_sword_strike_r">Sword Strike</string>
+        <string name="anim_angry_tantrum">Tantrum</string>
+        <string name="anim_express_tongue_out">TongueOut</string>
+        <string name="anim_hello">Wave</string>
+        <string name="anim_whisper">Whisper</string>
+        <string name="anim_whistle">Whistle</string>
+        <string name="anim_express_wink">Wink</string>
+        <string name="anim_wink_hollywood">Wink (Hollywood)</string>
+        <string name="anim_express_worry">Worry</string>
+        <string name="anim_yes_happy">Yes (Happy)</string>
+        <string name="anim_yes_head">Yes</string>
+        
+        <string name="texture_loading">Loading...</string>
+        <string name="worldmap_offline">Offline</string>
+        
+        <!-- Chat -->
+        <string name="whisper">whispers:</string>
+        <string name="shout">shouts:</string>
+
+</strings>
+
diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
index 623b800..2cdfb73 100644
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -100,9 +100,9 @@
 <PieMenuSelectedColor value="185, 200, 220, 120" />     <!-- Color of pie menu slice when selected -->
  
 <!-- MENU BAR -->
-<ParcelTextColor value="40, 40, 90, 255" />             <!-- Parcel name on menu bar, normal state -->
+<ParcelTextColor value="40, 40, 90, 255" />               <!-- Parcel name on menu bar, normal state -->
 <ParcelHoverColor value="70, 70, 100, 255" />           <!-- Parcel name on menu bar, hover state -->
-<TimeTextColor value="0, 30, 60, 255" />                <!-- SL Time on menu bar -->
+<TimeTextColor value="0, 30, 60, 255" />                    <!-- SL Time on menu bar -->
 <BalanceTextColor value="0, 100, 40, 255" />            <!-- Linden dollar balance on menu bar -->
 <HealthTextColor value="110, 15, 15, 255" />            <!-- Damage meter text on menu bar -->
  
@@ -175,14 +175,6 @@
 <FilterTextColor value="255, 200, 70, 255" />                   <!-- Inventory search text -->
 <InventorySearchStatusColor value="0, 0, 0, 255" />             <!-- "Searching..." -->
  
-<!-- HELP WINDOW -->
-<HelpBgColor value="200, 209, 204, 255" />
-<HelpFgColor value="0, 0, 0, 255" />
-<HelpScrollTrackColor value="0, 0, 0, 255" />
-<HelpScrollThumbColor value="255, 255, 255, 255" />
-<HelpScrollHighlightColor value="115, 132, 155, 255" />
-<HelpScrollShadowColor value="0, 0, 0, 255" />
-
 <!-- MISC -->
 <AvatarNameColor value="251, 175, 93, 255" />           <!-- Text color of avatar nametags -->
 <FocusColor value="239, 156, 0, 255" />                 <!-- Color of the glow around UI controls with keyboard focus -->
@@ -192,5 +184,4 @@
 <ContextSilhouetteColor value="239, 156, 0, 255" />     <!-- For "context" highlighting, i.e. pie menu -->
 <GroupOverTierColor value="110, 15, 15, 255" />         <!-- Warning text in Group Info window -->
 <ConsoleBackground value="0, 0, 0, 255" />              <!-- Background for inworld chat -->
- 
 </settings>
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 62c9537..d8261c2 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -44,6 +44,16 @@ class ViewerManifest(LLManifest):
         self.exclude("*.svn*")
         self.path(src="../../scripts/messages/message_template.msg", dst="app_settings/message_template.msg")
         self.path(src="../../etc/message.xml", dst="app_settings/message.xml")
+        self.path(src="../../../ChangeLog.txt", dst="doc/ChangeLog.txt")
+        self.path(src="../../../CONTRIBUTE.txt", dst="doc/CONTRIBUTE.txt")
+        self.path(src="../../../MANIFESTO.txt", dst="doc/MANIFESTO.txt")
+        self.path(src="../../../README.txt", dst="doc/README.txt")
+        self.path(src="../../../RELEASE_NOTES.txt", dst="doc/RELEASE_NOTES.txt")
+        self.path(src="../../doc/contributions.txt", dst="doc/ll-contributions.txt")
+        self.path(src="../../doc/FLOSS-exception.txt", dst="doc/FLOSS-exception.txt")
+        self.path(src="../../doc/GPL-license.txt", dst="doc/GPL-license.txt")
+        self.path(src="../../doc/releasenotes-where.txt", dst="doc/ll-releasenotes-where.txt")
+# 
 
         if self.prefix(src="app_settings"):
             self.exclude("logcontrol.xml")
@@ -171,9 +181,9 @@ class WindowsManifest(ViewerManifest):
     def final_exe(self):
         if self.default_channel():
             if self.default_grid():
-                return "Imprudence.exe"
+                return "imprudence.exe"
             else:
-                return "ImprudencePreview.exe"
+                return "imprudencepreview.exe"
         else:
             return ''.join(self.channel().split()) + '.exe'
 
@@ -183,14 +193,6 @@ class WindowsManifest(ViewerManifest):
         # the final exe is complicated because we're not sure where it's coming from,
         # nor do we have a fixed name for the executable
         self.path(self.find_existing_file('debug/imprudence-bin.exe', 'release/imprudence-bin.exe', 'relwithdebinfo/imprudence-bin.exe'), dst=self.final_exe())
-        # need to get the kdu dll from any of the build directories as well
-        #self.path(self.find_existing_file(
-                # *FIX:Mani we need to add support for packaging specific targets.
-                #'../llkdu/debug/llkdu.dll',
-                #'../llkdu/release/llkdu.dll',
-                #'../llkdu/relwithdebinfo/llkdu.dll',
-                #'../../libraries/i686-win32/lib/release/llkdu.dll'), 
-                #  dst='llkdu.dll')
 
         self.gather_documents()
 
@@ -212,6 +214,12 @@ class WindowsManifest(ViewerManifest):
             self.path("openjpeg.dll")
             self.end_prefix()
 
+        # For sound
+        if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
+            self.path("openal32.dll")
+            self.path("alut.dll")
+            self.end_prefix()           
+
         # Mozilla appears to force a dependency on these files so we need to ship it (CP)
         self.path("msvcr71.dll")
         self.path("msvcp71.dll")
@@ -244,18 +252,20 @@ class WindowsManifest(ViewerManifest):
             self.end_prefix()
 
         # Vivox runtimes
-        #if self.prefix(src="vivox-runtime/i686-win32", dst=""):
+        if self.prefix(src="vivox-runtime/i686-win32", dst=""):
+        #    self.path("alut.dll")
+            self.path("wrap_oal.dll")
+
         #    self.path("SLVoice.exe")
         #    self.path("SLVoiceAgent.exe")
         #    self.path("libeay32.dll")
         #    self.path("srtp.dll")
         #    self.path("ssleay32.dll")
         #    self.path("tntk.dll")
-        #    self.path("alut.dll")
         #    self.path("vivoxsdk.dll")
         #    self.path("ortp.dll")
-        #    self.path("wrap_oal.dll")
-        #    self.end_prefix()
+
+            self.end_prefix()
 
 #        # pull in the crash logger and updater from other projects
 #        self.path(src=self.find_existing_file( # tag:"crash-logger" here as a cue to the exporter
@@ -440,17 +450,15 @@ class DarwinManifest(ViewerManifest):
                 self.path("Japanese.lproj")
                 self.path("Korean.lproj")
 
+
                 # SLVoice and vivox lols
-                #self.path("vivox-runtime/universal-darwin/libalut.dylib", "libalut.dylib")
-                #self.path("vivox-runtime/universal-darwin/libopenal.dylib", "libopenal.dylib")
+                self.path("vivox-runtime/universal-darwin/libalut.dylib", "libalut.dylib")
+                self.path("vivox-runtime/universal-darwin/libopenal.dylib", "libopenal.dylib")
                 #self.path("vivox-runtime/universal-darwin/libortp.dylib", "libortp.dylib")
                 #self.path("vivox-runtime/universal-darwin/libvivoxsdk.dylib", "libvivoxsdk.dylib")
                 #self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice")
                 #self.path("vivox-runtime/universal-darwin/SLVoiceAgent.app", "SLVoiceAgent.app")
 
-                # llkdu dynamic library
-#                self.path("../../libraries/universal-darwin/lib_release/libllkdu.dylib", "libllkdu.dylib")
-                
                 #libfmodwrapper.dylib
                 #self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib")
                 
@@ -658,7 +666,6 @@ class Linux_i686Manifest(LinuxManifest):
         self.path("app_settings/mozilla-runtime-linux-i686")
 
         if self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"):
-#            self.path("libkdu_v42R.so")
 #            self.path("libfmod-3.75.so")
             self.path("libapr-1.so.0")
             self.path("libaprutil-1.so.0")
@@ -673,19 +680,19 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libopenjpeg.so.2")
             #self.path("libtcmalloc.so.0") - bugged
             #self.path("libstacktrace.so.0") - probably bugged
-#            self.path("libllkdu.so", "../bin/libllkdu.so") # llkdu goes in bin for some reason
             self.end_prefix("lib")
 
             # Vivox runtimes
             #if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):
             #        self.path("SLVoice")
             #        self.end_prefix()
-            #if self.prefix(src="vivox-runtime/i686-linux", dst="lib"):
-            #        self.path("libopenal.so.1")
+            
+            if self.prefix(src="vivox-runtime/i686-linux", dst="lib"):
+                self.path("libopenal.so.1")
+                self.path("libalut.so")
             #        self.path("libortp.so")
             #        self.path("libvivoxsdk.so")
-            #        self.path("libalut.so")
-            #        self.end_prefix("lib")
+                self.end_prefix("lib")
 
 class Linux_x86_64Manifest(LinuxManifest):
     def construct(self):