Merge remote-tracking branch 'origin/next' into WL-refactor

imprudence · Jul 14, 2013 · c7f06e9 · c7f06e9
2 parents 1e22c4f + f4d49c3
commit c7f06e9
Show file tree

Hide file tree

Showing 151 changed files with 3,470 additions and 1,437 deletions.
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
@@ -3,6 +3,97 @@
   http://imprudenceviewer.org
 
 
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  =-                         1.4.0 beta 2                   -=
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+
+    CHANGES
+
+      This version of Imprudence mostly contains bug fixes, as
+      Imprudence went into a feature freeze in anticipation of an RC
+      release to come later.
+
+
+      IMPROVEMENTS
+
+        * Selective cache clearing: now you can selectively delete
+          different types of disk cache separately.
+
+      BUG FIXES
+
+        Many bug fixes that are listed here -
+
+        http://wiki.kokuaviewer.org/wiki/Imprudence:Release_Notes/1.4.0_Beta_2
+
+
+
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  =-                         1.4.0 beta 1                   -=
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+    There was very many changes in 1.4.0 beta 1 compared to Imprudence
+    1.3.2, this file only summarizes some of them.  A more complete list
+    is here -
+
+    http://wiki.kokuaviewer.org/wiki/Imprudence:Release_Notes/1.4.0_Beta_1
+
+
+    RELEASE HIGHLIGHTS
+
+      Compared to Imprudence 1.3, Imprudence 1.4 adds a mind-blowing
+      number of new features, UI improvements, and bug fixes. We
+      recommend Imprudence 1.3 users also upgrade to Imprudence 1.4
+      soon, unless you require streaming audio support on Mac.
+
+      Here is a brief overview of some of the most notable new features,
+      grouped by category:
+
+      * General: Support for WindLight notecards; Updated Chinese,
+        French, German, and Japanese UIs; Derender object/avatar; Gestures
+        can use more keys; Reload $ Balance; Animation Overrider starts
+        working sooner.
+
+      * Communication: Spell Checking; AutoCorrect; Chat Translation;
+        Chatbar Commands; Display Names support; Highlight chat from
+        friends; Highlight chat mentioning your name or nickname(s);
+        Search bar in Friends and Groups lists.
+
+      * Content Creation: Support for Alpha and Tattoo layers; new Prim
+        Alignment tool; Local Textures (real-time preview of textures on
+        your computer without uploading); Object texture export from SL
+        (with TPVP-compliant permission checks); Upload support for
+        Photoshop PSD image files (available on Mac only); Copy/Paste
+        buttons in Build tools.
+
+      * Login, Grids, and OpenSim: Login name and password saved
+        per-grid; Support for variable sized regions (i.e. bigger than
+        256m) when available; Support for the OpenRegionInfo capability.
+
+      * Map, Radar, and Teleport: Full Radar; Teleport History; Estate
+        Managers’ minimap radar distance is no longer limited; Right
+        clicking objects in Area Object Search to teleport to/cam to/edit
+        them.
+
+      * Media, Browser, and Networking: Media system revamped with
+        SLPlugin; Media Filters; Interaction and zoom with streaming
+        media/webpages; Improved XMLPRC and SOCKS5 proxy support; Parcel
+        media URLs are no longer hidden.
+
+      * Preferences: Reorganized Preferences window; New UI skins (Dark
+        and Gemini); Sliders for draw distance, etc. allow typing in exact
+        values; Search bar in Debug Settings.
+
+      * Texture Loading: Many, many texture loading improvements from
+        Robin Cornelius, Thickbrick Sleaford, and others; Various
+        improvements to help prevent unloaded (cloud) avatars.
+
+      * Development: Many, many, many code improvements and cleanup
+        under the hood. Special thanks to Aleric Inglewood and others for
+        their work on this.
+
+
+
   =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
   =-                         1.3.2                          -=
   =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-

diff --git a/linden/etc/message.xml b/linden/etc/message.xml
@@ -702,6 +702,12 @@
 
 			<key>FetchLib</key>
 			<boolean>true</boolean>
+
+			<key>ObjectMedia</key>
+			<boolean>false</boolean>
+
+			<key>ObjectMediaNavigate</key>
+			<boolean>false</boolean>
 		</map>
 
 		<key>messageBans</key>

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
@@ -24,6 +24,11 @@ list(REMOVE_DUPLICATES TYPES)
 set(CMAKE_CONFIGURATION_TYPES ${TYPES} CACHE STRING "Supported build types." FORCE)
 unset(TYPES)
 
+# Work around nmake / VS difference.
+set(VIEWER_CFG_INTDIR ${CMAKE_CFG_INTDIR})
+if (NMAKE)
+    set(VIEWER_CFG_INTDIR ${CMAKE_BUILD_TYPE})
+endif(NMAKE)
 
 # Determine the number of bits of this processor