adfa7d49de
tag merge of DRTVWR-298
2013-04-18 14:55:23 -04:00
35cbd7d777
add newline
2013-04-18 14:55:03 -04:00
a1ca90f893
Blank line on end of files as per commit hook requirements
2013-04-18 11:50:40 -07:00
6383c8829f
New fix for the fix for Linux build now that gcc upgraded to 4.6 by default
2013-04-17 15:56:45 -07:00
1fa45e7448
Fix for Linux build now that gcc upgraded to 4.6 by default
2013-04-17 15:46:40 -07:00
623cb0c39f
fix for missed merge changes
2013-04-17 14:31:30 -07:00
88eff41649
Merge with viewer-development
2013-04-17 13:38:04 -07:00
fac6ee27f2
increment version to 3.5.2
2013-04-12 12:42:03 -04:00
f12b2c7bca
Added tag 3.5.1-beta1 for changeset 20cdf370f5c8
2013-04-12 12:10:36 -04:00
edf5b6a8b7
pull changes for Sunshine beta
2013-04-12 12:10:24 -04:00
01fb17cbc5
Added tag 3.5.1-beta1 for changeset 0ca3910763ce
2013-04-12 11:17:33 -04:00
460c81070e
tag merge of DRTVWR-310
2013-04-04 16:43:15 -04:00
37303b9a2b
merge with latest viewer-development
2013-04-04 14:26:43 -04:00
08bd67c0dd
SH-4059 FIX other's hover parameters affects your avatar's setting
...
Added an additional sanity check to make sure that other avatars don't
affect your wearables.
2013-04-04 11:38:23 -04:00
4bcf1b911a
SH-4051 REVERT teen accounts unable to remove underclothes even when switching outfits
...
Reverting fix as additional problems were found that could lead to even accidental nudity.
This fix is not required for the current release as it is not a regression.
Will review options for fixing for the next release.
2013-04-03 19:04:57 -04:00
106864bb8a
merge
2013-04-03 19:00:13 -04:00
b724791c2a
SH-4050 FIX camera goes below ground when avatar offset set to 0
...
Added a constraint to ensure that the avatar's height (with offset)
does not go below 0.1 meters. Camera was getting confused since the avatar's
effective height was negative.
Note the avatar is mostly underground/contorted even at 0.1 meters, but
most users setting values this low will be making ultra-tinies and would
be hiding the avatar mesh. Camera stays above ground when height is at 0.1.
2013-04-03 18:59:50 -04:00
00390ccbd7
merge changes for 3.5.0-release
2013-04-03 15:11:28 -04:00
8a330ee2eb
Added tag 3.5.0-release for changeset adc360e6bf21
2013-04-03 15:01:24 -04:00
d1d0a2cf67
SH-4058 - log spam reduction initiative.
2013-04-03 14:58:33 -04:00
d7b530008e
SH-3058 WIP - disable debug-level logging for avatar by default
2013-04-03 11:09:23 -04:00
0b5695fec1
merge
2013-04-02 20:42:41 -04:00
72d0d81c7e
SH-4057 FIX - cleaned up old canUseHTTP logic, now lives in llviewertexture.cpp
2013-04-02 20:40:19 -04:00
af78acc037
merge
2013-04-02 18:33:26 -04:00
7ea7b236d8
BUILDFIX commit policy fixes
2013-04-02 18:32:57 -04:00
96d87aa85e
merge
2013-04-02 17:27:20 -05:00
ef6242d729
Merged in chui beta code.
2013-04-02 17:15:48 -05:00
3eae5ba0d0
Removed setCanUseHTTP override in llvoavatar
2013-04-02 18:02:59 -04:00
e50a8b9a2b
merge
2013-04-02 17:55:41 -04:00
56d4a9f36b
SH-4057 FIX - host bake textures should start with UDP fetching now, instead of waiting to fail down
2013-04-02 17:54:30 -04:00
49731dd21d
SH-4051 FIX problem with teen account and undershirt layers
...
Updated logic for teen accounts, to ensure that during any transition
that they are wearing at least one undershirt wearable and one
underpants wearable.
2013-04-02 12:51:45 -04:00
15b91b9149
SH-4044 FIX voice dot is offset vertically if using avatar height offset
...
Added the height offset in one too many places. fixing.
2013-04-02 12:46:41 -04:00
3f1ad7dbd0
CHUI-811 FIXED [CHUIBUG]Too much spacing around the new chat UI elements
2013-04-02 18:56:52 +03:00
09db2bd9ff
CHUI-896 : ADD FIX : Line flashing and FUI button flashing not working correctly for CHUI notifications
...
backed out 902caf2 and (partly) d498514; case "NOT_ON_TOP" was fixed
2013-04-01 19:40:40 +03:00
791040d03b
merge
2013-04-01 17:12:47 -07:00
b37f501a87
CHUI-796 (User doesn't get all messages in 'do not disturb' mode): Now when a conversation is focused by clicking on it's line item, selecting a torn off floater or unminimized a torn off floater the stored notifications for that conversation will be removed.
2013-04-01 15:36:05 -07:00
c588f6be31
CHUI-907 : Fixed! Suppress inexistant menu item and duplicated registrar entry to avoid warning
2013-04-01 13:39:14 -07:00
cb4ec92582
CHUI-907 : Prevent warning when parsing menus adding name to menu_item_check
2013-04-01 13:04:24 -07:00
56939a2a2b
CHUI-904 FIXED Set the focus on the Nearby chat floater after setting visibility.
2013-04-01 20:09:37 +03:00
b3e3cf8151
merge
2013-04-01 20:06:23 +03:00
90b56ee9fa
merge changes for 3.5.0-beta7
2013-04-01 09:34:41 -04:00
49bef4e122
Added tag 3.5.0-beta7 for changeset 5c6098fd17d4
2013-04-01 09:33:58 -04:00
255159c50f
CHUI-886 (Time in front of the name is not displayed when the Conversations size is reduced to a minimum.)
2013-04-01 08:53:44 +03:00
2d84b0605e
CHUI-807 : Trace add and remove sessions
2013-03-29 17:40:16 -07:00
7c7ccf27d1
CHUI-807 : Add more defensive coding. Also trace in log the sessions created so we'll have a better idea of what people do with conversations if we see that crash again.
2013-03-29 17:22:53 -07:00
adc4f8d02e
merge
2013-03-29 18:06:05 -04:00
8e7c04f1d0
SUN-57 SH-4039 FIX bake fail on non-ssb regions
...
We were getting the texture ID from the type,index couple, but were not
passing in index, which defaulted to 0. texture ID is available from the
texture object itself, so using that and removing the index parameter
to prevent future confusion.
2013-03-29 18:05:36 -04:00
7333731bbc
merge changes for DRTVWR-306
2013-03-29 17:31:00 -04:00
430b8547c4
tag merge of DRTVWR-306
2013-03-29 17:30:54 -04:00
ab272c20a9
Another Chui beta6+ merge to deal with build issues
2013-03-29 13:22:51 -05:00
Oz Linden