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
Mnikolenko ProductEngine
e5b930c92a
MAINT-3301 FIXED Use separate xml files (saved as open_notifications_<grid>.xml) for each grid.
2014-06-23 11:02:51 +03:00
callum_linden
050ba45533
Fixing some merge screwups someone in the last 10,000 comnits
2014-06-20 16:56:49 -07: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
maksymsproductengine
7991fe96ec
MAINT-3475 FIXED 'windows 64bit (?) crash in LLTextBase::getDocIndexFromLocalCoord'
2014-06-20 20:26:51 +03: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
Mnikolenko ProductEngine
4a7d60aaea
MAINT-1192 FIXED Empty folders remain in the recent items tab of inventory until relog
2014-06-20 11:09:31 +03:00
Aura Linden
246d501440
Pulled fix for MAINT-3154
2014-06-19 16:36:48 -07:00
andreykproductengine
a7db93cb69
MAINT-4182 FIXED The group ban list always appears empty
2014-06-19 21:23:14 +03:00
Dave Parks
d0428575fb
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2014-06-19 13:14:42 -05:00
andreykproductengine
f938c7f7ab
MAINT-4174 FIXED "Ban Resident(s)" button in Banned residents tab is active for members without ban permissions, after viewing 'Banned Residents' tab in a group where they do have ban permissions
2014-06-19 17:38:39 +03:00
Aura Linden
a4d60d6721
Pulled merge from release.
2014-06-18 11:32:53 -07:00
maksymsproductengine
f8627d4342
MAINT-3967 FIXED Up arrow key does not move the cursor up in chat field.
2014-06-18 20:23:34 +03:00
Mnikolenko ProductEngine
24ebc86b41
MAINT-4157 FIXED Lag meter tool tips are missing units
2014-06-19 12:07:14 +03:00
simon
d760a6889d
Merge downstream code
2014-06-18 19:02:25 -07:00
maxim@mnikolenko
f924175da0
MAINT-3186 FIXED Disable menu items if group or ad-hoc chat is in multiselection
2014-06-18 13:00:18 +03:00
Merov Linden
7d7d042691
Retropedaling on SH-4030 fix that crashes my viewer on loggin
2014-06-17 15:43:51 -07:00
Merov Linden
e3e1a527cc
DRTVWR-354 : Rewrite Responders for Twitter and Flickr to conform to new LLHTTPClient interface. Fix merge error in Facebook connect as well
2014-06-17 15:12:31 -07:00
Merov Linden
c4c8debfc2
Pull merge from lindenlab/viewer-release
2014-06-17 11:12:27 -07:00
simon
592024b580
Merge viewer-release and become version 3.7.9
2014-06-17 10:40:42 -07:00
Richard Linden
ff325bd7ae
Merge
2014-06-17 10:34:24 -07:00
Monty Brandenberg
d16e1b1b55
Post-merge cleanup. In onCompleted() restore the unconditional
...
use of setGetStatus() in case the baked texture service changes
introduced some sort of hidden (and wrong) dependency. Left
out the ridiculous duplicated invocation inside that failure status
block. Someone damaged texture console again and apparently didn't
even bother to look at their work. I'm sure they documented
their changes on the public wiki as well. Unified the logging
tag throughout lltexturefetch.cpp. Only way to get the cut-n-
pasters to do the right thing.
2014-06-17 13:18:50 -04:00
Jonathan Yap
e2c4d2a0a1
STORM-2034 Adjust comment block indent
2014-06-17 05:45:20 -04:00
Chris Baker
ee14005a2a
viewer-release merge
2014-06-16 21:15:41 +00:00
Monty Brandenberg
903729d5c9
Merge. Refresh from viewer-release after 3.7.9 release.
2014-06-16 16:41:52 -04:00
Callum Prentice
f11dd1d8a3
Merge with head of viewer-release
2014-06-16 13:22:19 -07:00
Oz Linden
142e8edcd3
correct merge mistake
2014-06-16 14:35:23 -04:00
andreykproductengine
3686dc3e37
MAINT-3634 FIXED After right-clicking another avatars nametag or avatar then pressing the "Alt" key, most options in the dropdown menu will no longer function.
2014-06-16 20:38:43 +03:00
Mnikolenko ProductEngine
19560d1b75
MAINT-1192 FIXED Don't show folder without recent item in it for "Recent" tab.
2014-06-17 11:24:02 +03:00
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
Jonathan Yap
ae7e074e7c
STORM-2034 Fix and improve processing when hours overflow to days
2014-06-11 17:05:06 -04:00
maksymsproductengine
a92dbb592b
MAINT-4133 FIXED Import llpanelgroupinvite.cpp from viewer_lion to voorhees_groupban.
2014-06-11 20:24:25 +03:00
Jonathan Yap
078941c4a4
STORM-2034 Made small coding change per Oz's request
2014-06-10 17:23:48 -04:00
Jonathan Yap
51aa604af4
STORM-2034 Try to fix incorrect logic about increasing and decreasing filtering.
...
Minor XML adjustment.
2014-06-10 13:06:53 -04: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
Jonathan Yap
e856e10c7d
STORM-2034 Trivial code cleanup
2014-06-09 11:15:09 -04:00
Cinder
58bf0dd580
Capitalize script colors floater for consistency.
2014-06-08 18:47:17 -06:00