Commit Graph

32426 Commits (53e5a79bd1784ec8cd3f69583c9c7a6746a68dfd)

Author SHA1 Message Date
Oz Linden e15002a11c merge changes for 3.7.9-release 2014-06-16 11:42:37 -04:00
Oz Linden 977476171d increment viewer version to 3.7.10 2014-06-16 11:35:23 -04:00
Oz Linden de8af18157 Added tag 3.7.9-release for changeset a9f2d0cb11f7 2014-06-16 11:34:48 -04:00
maksymsproductengine a92dbb592b MAINT-4133 FIXED Import llpanelgroupinvite.cpp from viewer_lion to voorhees_groupban. 2014-06-11 20:24:25 +03:00
andreykproductengine db977d6df8 MAINT-4135 FIXED Text input field is not disabled in group chat window for user who cannot enter text chat 2014-06-10 19:51:11 +03:00
Mnikolenko ProductEngine b5e3899a40 MAINT-4112 FIXED Disable moving objects composed of multiple items to My outfits. 2014-06-11 12:31:10 +03:00
Mnikolenko ProductEngine 6c84bfb719 MAINT-4132 FIXED Don't call notification for debug messages from not owned objects 2014-06-10 10:59:14 +03:00
Cinder 78be5c3aa5 STORM-2026 - Use more unique syntax colors by default, also clean up some indentation 2014-06-09 16:19:20 -06:00
Cinder 41f6c5ce48 Greatly simplify LLSyntaxIdLSL:
* Move file fetched callback to the singleton and handle all syntax id changes within the singleton
* Remove a fair number of bool checks and method relying more on callbacks to drive syntax changes.
* Don't pretty print the cache file to conserve space and to speed up xml to llsd parsing
* Clean up includes
2014-06-09 15:14:09 -06:00
Merov Linden 9e855b03b7 MAINT-4001 : Pull merge in viewer-tiger for quick release 2014-06-09 13:03:41 -07:00
Aura Linden 4bcf2079f1 Fix for maint-3154 alt-zoom zooms way out 2014-06-09 10:28:18 -07:00
Cinder 58bf0dd580 Capitalize script colors floater for consistency. 2014-06-08 18:47:17 -06:00
Cinder 052869130c Don't allow script colors floater resize 2014-06-08 18:46:22 -06:00
Cinder 84eb667163 Update syntax color floater with recent changes. 2014-06-08 18:41:45 -06:00
Cinder b06e63aced Fix lsl constant highlighting and sort the if-else chain to parse a little quicker 2014-06-08 18:28:10 -06:00
Cinder 6a6508f0fd Use a common SyntaxLSL broad tag to make debugging easier 2014-06-08 17:51:31 -06:00
Cinder a9a1173886 Update sample script in script colors floater 2014-06-08 17:49:24 -06:00
Cinder 904fd4245b "sections" is apparently unused as well. 2014-06-08 17:10:57 -06:00
Merov Linden 086b2c0448 MAINT-4001 : Make Received Items not movable (protected), consolidate Received Items folders which may have been moved 2014-06-07 16:02:30 -07:00
Cinder 79e0e7d298 Merge upstream 2014-06-07 14:14:29 -06:00
Monty Brandenberg f3a037f8ad Merge. Bring manifest work together with bug fix work. 2014-06-06 21:33:30 +00:00
Monty Brandenberg 5429cec9e9 BUG-3323/SH-4375 Server side baking not baking AVs over cellular network.
This is a workaround that the TPVs have been exercising for quite a few
months and it does seem to fix the OPs problem.  The solution is based
on magic numbers and has no technical basis, it's just an artifact of
particular networking gear and/or ISPs.
2014-06-06 21:31:31 +00:00
Stinson Linden 61f3bf8a47 MAINT-4137: Correcting a potential crash. This change should fix the most probable location of a callstack being reported by the crash reporter. However, there is no reproduction yet, so hard to test whether this actually patches the crash occcurrence. 2014-06-06 19:30:41 +01:00
Stinson Linden bde6023286 MAINT-4137: Correcting some poorly written CPP code that could potentially lead to problems in the future. 2014-06-06 19:28:18 +01:00
Mnikolenko ProductEngine c464a11958 MAINT-4123 FIXED return LLModel::BAD_ELEMENT for mesh with empty tex coords array 2014-06-06 11:44:58 +03:00
Monty Brandenberg 2ccbef39a6 All: Update openssl to 1.0.1h/290662, curl to 290664, llqtwebkit to 290663.
Linux:  Include libQtXml and libQtSvg in manifest for libqsvg.so.
More documentation thoughts for library package structure.
2014-06-05 18:37:24 -04:00
Stinson Linden 47a5e1c751 MAINT-4009: Ensuring that the local bitmaps are cleaned up on app exit. 2014-06-05 23:15:43 +01:00
Stinson Linden 739f4954b1 Correcting a build error. 2014-06-06 22:35:59 +01:00
Ricky Curtice 98720c3cec Merge 2014-06-05 06:31:30 -07:00
Cinder e6b20328c2 A little more cleanup in LLSyntaxIDLSL and LLKeywords 2014-06-04 22:51:20 -06:00
Monty Brandenberg eb8cf27cc5 All: Update .png files with conformance problems as reported by pngfix.
With the updated PNG library (1.6.8), we're getting stderr warnings about
non-conformance issues with images in the build.  These warnings include:

  * iCCP: known incorrect sRGB profile
  * iCCP: profile 'ICC Profile': 1000000h: invalid rendering intent
  * iCCP: cHRM chunk does not match sRGB

These were normalized by running an ImageMagick 'convert -strip' pass
over each PNG image.  'compare -metric AE' reports 0 delta for all
before/after pairs.
2014-06-04 19:44:02 +00:00
Cinder 4170ae1027 STORM-2025: Part 2 - After consulting with Oz, remove subcategories of constants and fix highlighting 2014-06-04 12:52:27 -06:00
Oz Linden 7e8d4ca3b1 make "default" a constant, and remove that and "state" from events 2014-06-04 10:29:40 -04:00
maxim@mnikolenko 6f056ef99d MAINT-4113 FIXED Get total contribution as sum of parcels' billable area. 2014-06-04 13:01:58 +03:00
Monty Brandenberg 5b542e227b All: Committing to llqtwebkit2 and the future. Updating all libraries.
Updating SDL to 290561, c-ares to 290399, Boost to 290566, colladadom
to 290576, curl to 290567, fontconfig to 290569, freetype to 290557,
google-mock to 290574, libpng to 290558, libxml2 to 290562, llqtwebkit
to 290578, openssl to 290560, PCRE to 290406, zlib to 290556.  Document
compiling and linking in new 00-COMPILE-LINK-RUN.txt in indra/cmake.  It
is the README for the building process based on things learned during
this library project.  Switch building process back to style used for
new llqtwebkit2 repo.  This builds shared libraries for Qt4 products
on all platforms using current build machines and TC task templates.
All platforms are building.  All have comparable FPS rates.  Builds are
getting quieter.  Forward, comrades!
2014-06-03 19:37:58 -04:00
eli 1655887f30 FIX INTL-142 translations for Viewer Set40 2014-06-03 16:27:47 -07:00
andreykproductengine 75b68cf3f4 MAINT-2881 FIXED Open folders close when you create a new folder, new script, new notecard etc 2014-06-03 20:01:45 +03:00
Mnikolenko ProductEngine 445b13dc52 MAINT-4120 FIXED Remove the message because it's only called for STATE_WEARABLES_WAIT state. 2014-06-03 13:52:39 +03:00
Mnikolenko ProductEngine c5f85d6e38 MAINT-4076 FIXED Don't use autocomplete to shout/whisper if several triggers match the prefix 2014-06-03 11:19:25 +03:00
Stinson Linden 8392fde6f6 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365. 2014-06-02 22:32:16 +01:00
Stinson Linden 51e0cc8140 MAINT-4114: Refactoring the LLBadge code to ensure a parent view always has the badge (to preserve memory cleanliness), but to also allow for badge reparenting so that the NEW badge works in the inventory window. This change relates to 9e0d629da1487f850beb2767bd47734c4ccc393e. 2014-05-31 02:30:12 +01:00
Stinson Linden 90fc7a13d1 MAINT-4106: Correcting crash on exit behavior during normal shutdown. With the more comprehensive texture cleanup going on, this code was causing an crash on exit when gAgentAvatarp was null. Adding a check for null before proceeding. 2014-05-29 21:08:21 +01:00
andreykproductengine 984cc0788d MAINT-3504 FIXED Avatar cannot move after TPing into region he nearly crossed into 2014-05-29 19:19:41 +03:00
Mnikolenko ProductEngine 863cf3e64a MAINT-865 FIXED Multiline description in Place profile is shown as one line after changing floater width 2014-05-30 12:24:37 +03:00
Mnikolenko ProductEngine 6ad62c6bf5 MAINT-4099 FIXED Use toggleOpen() to open/close folders via Enter key 2014-05-30 11:56:41 +03:00
AndreyL ProductEngine fadf35b90a MAINT-4086 FIXED Limit the number items "Replace Current Outfit" or "Wear" applies to 2014-05-29 10:57:16 +03:00
Mnikolenko ProductEngine a7b523b36a MAINT-4071 FIXED Use LLViewerStats::instance().getRecording() to get correct stats. 2014-05-29 13:49:25 +03:00
Mnikolenko ProductEngine 0fdff14b66 MAINT-4094 FIXED Use unescaped region name in the notification 2014-05-29 13:05:09 +03:00
Monty Brandenberg 98ecd04436 Win: Get running on Windows. Remove DOM_DYNAMIC, link with libxml2_a.lib.
Release and Debug builds working.  Remove the DOM_DYNAMIC define so
that we don't create declspec declarations to colladadom objects
and pull in libxml2_a (_a for archive) to complete the link.  Debug
functional and would be moreso if not for all the CrtCheckMemory()
calls.
2014-05-28 19:10:26 -04:00
Monty Brandenberg 71eb87d0a5 Windows/Mac: Update llqtwebkit to 290262. Simple rebuild of library with
package dependencies updated.
2014-05-28 19:44:27 +00:00