Commit Graph

32398 Commits (97c4c4cf60a5fbbcef4e1bd4213244a5c906d276)

Author SHA1 Message Date
dolphin 97c4c4cf60 Merge 2014-08-06 09:25:02 -07:00
dolphin 81c342dfa9 Merge with 3.7.13-release 2014-08-06 09:22:43 -07:00
Oz Linden 1346949e4d increment viewer version to 3.7.14 2014-08-04 14:41:11 -04:00
Oz Linden 66aeec75ab Added tag 3.7.13-release for changeset d86a7e1bc96d 2014-08-04 14:41:11 -04:00
maksymsproductengine 1634f0f46c viewer-release 3.7.13 merge 2014-07-22 08:58:31 +03:00
Oz Linden 532433674c increment viewer version to 3.7.13 2014-07-21 14:35:27 -04:00
Oz Linden 530fe90d3d Added tag 3.7.12-release for changeset 3b44ea8988cb 2014-07-21 14:35:27 -04:00
Cho 3b2f456416 Added mLocationSLURL to fix ACME-1560 2014-07-18 01:45:48 +01:00
dolphin 4734e381df fixed XP_ERROR_... constants 2014-07-17 14:55:19 -07:00
andreykproductengine 9f5fc6efbd MAINT-4241 FIXED [Group Bans] Ban member(s) button is not greyed out for banning group owners. Viewer gives message that you ejected group owner. 2014-07-17 20:30:35 +03:00
maksymsproductengine 0f22bcdff0 MAINT-4263 FIXED Viewer crashes after right click on group in Conversations. 2014-07-16 02:16:48 +03:00
Mnikolenko ProductEngine b4df05d21a MAINT-4226 Group ban option is added to participant menu in Group chat. 2014-07-14 12:31:16 +03:00
maksymsproductengine 3b5b6e35c4 fixing merge conficts 2014-07-12 02:51:27 +03:00
dolphin 487fce4afa Merge with 3.7.11-release 2014-07-09 15:22:12 -07:00
maksymsproductengine 58c86cf59e merge changes for 3.7.12-release 2014-07-10 00:23:01 +03:00
dolphin e414dfad51 Merge 2014-07-09 13:43:24 -07:00
Brad Payne (Vir Linden) ff3827f278 merge 2014-07-09 14:32:46 -04:00
Brad Payne (Vir Linden) bfb9fc85b9 MAINT-4216 FIX 2014-07-09 14:26:16 -04:00
simon 3e6698073c Merge viewer-release and become version 3.7.12 2014-07-07 14:49:45 -07:00
Oz Linden 226929f8f5 increment viewer version to 3.7.12 2014-07-07 15:54:24 -04:00
Oz Linden d96af562ca Added tag 3.7.11-release for changeset 64799eb29883 2014-07-07 15:54:24 -04:00
Dave Parks 770a0a2dea MAINT-2980 Back out most changes related to upping the 512MB texture cap to unblock RC. 2014-07-07 10:28:54 -05:00
andreykproductengine 70c2472e42 MAINT-4203 FIXED [Group Bans] Member list shows newly banned ex-residents 2014-07-02 16:57:07 +03:00
Cho f804bcadb1 Added 'Loading experiences...' message on experience lists before populating lists for ACME-1543 2014-07-02 01:05:52 +01:00
Cho e20276aada Hide experiences accordion when creating new group for ACME-1542 2014-07-02 00:38:22 +01:00
Dave Parks b51f81e7fe MAINT-2980 Fix for mac cutting texture memory in half (now that we're cutting texture memory to default to 1/3rd of installed ram, pre-cutting is redundant). 2014-06-30 19:59:01 -05:00
Dave Parks 8dee70dfbb MAINT-2980 Fix for AMD cards reporting system ram + vram for dedicated vram -- use WMI instead of DxDiag to get dedicated video memory. 2014-06-30 19:54:28 -05:00
dolphin dd309984d7 Merge 2014-06-27 12:57:16 -07:00
Cho f80a41cf36 Sort experiences in list alphabetically by name for ACME-1537 2014-06-27 01:02:44 +01:00
Cho 8ab5a25b12 merge 2014-06-26 19:31:55 +01:00
Cho 9b6598388a Disable About Land Experiences tab when parcel is not selected, for ACME-1528 2014-06-25 22:11:31 +01:00
andreykproductengine 854c251fef MAINT-4178 FIXED [Group Bans] The viewer allows you to attempt to ban when the ban list already contains 500 entries, which fails. 2014-06-25 20:09:33 +03:00
Cho 200788c344 Updated all experience responders for LLCurl::Responder interface changes for ACME-1535 and ACME-1536 2014-06-24 22:43:23 +01:00
Cinder c3573b6d7b STORM-2035 - Looking for a good selection box contrast 2014-06-24 15:27:08 -06:00
dolphin 74634fb9da Merge with 3.7.10-release 2014-06-24 10:10:10 -07:00
simon 527f180dd7 Merge viewer-release and become version 3.7.11 2014-06-24 09:47:21 -07:00
Dave Parks 07e7fbb4ad Automated merge with https://bitbucket.org/lindenlab/viewer-tiger 2014-06-23 23:10:45 -05:00
Dave Parks 90ee53f5a1 MAINT-2980 Up texture memory slider cap to 4096MB. Make "Texture Memory" default to 1/3rd of video memory. Add description on debug setting and tooltip to explain why. 2014-06-23 23:10:23 -05:00
Cho a9c281eb57 Updated ExperienceResponder in llpreviewscript.cpp to use new LLCurl::Responder interface for ACME-1534 2014-06-24 03:47:03 +01:00
Oz Linden 498a0e36e5 merge changes for 3.7.10-release 2014-06-23 14:03:12 -04:00
Oz Linden c7057ef56e increment viewer version to 3.7.11 2014-06-23 13:43:50 -04:00
Oz Linden 00b4a71407 Added tag 3.7.10-release for changeset 91dae9494b4d 2014-06-23 13:43:50 -04:00
andreykproductengine be2f4ecdb4 MAINT-4175 FIXED [Group Bans] When banning a list of multiple avatars, if an already banned avatar is included in the list, no avatars are added to the ban list and those avatars already group members are not ejected from the group. 2014-06-23 18:39:53 +03:00
Chris Baker b534562acf viewer-release merge 2014-06-23 22:36:47 +00:00
andreykproductengine 845b80a386 MAINT-4182 Cleaning up 2014-06-23 13:25:17 +03:00
Cho 7a15be83bf Updated LLExperienceListResponder to use new LLCurl::Responder interface to fix ACME-1533 2014-06-20 22:15:49 +01:00
Cinder 8d2e0fb3a0 STORM-2035 - Invert the background color in script editors for highlighting sections. Since the background color can be changed by the user, this ensures distinctive highlighting 2014-06-20 13:43:31 -06:00
Cinder 984353d7ca STORM-2036 - Fix trying to parse caps too early by adding a callback to check region caps when they haven't already been received 2014-06-20 11:02:50 -06:00
Cinder d949bee053 BUG-6425 - Init default keywords file during ctor so we have something to fallback on should caps or fetch fail 2014-06-20 10:17:31 -06:00
Cho c88b237473 Updated LLExperienceCache::LLExperienceResponder to work with updated LLCurl::Responder interface, to fix ACME-1532 and ACME-1525 2014-06-20 04:19:45 +01:00