Commit Graph

27543 Commits (4bbcd26941c3be6b83214d0dc45c70f99e474dda)

Author SHA1 Message Date
Brad Payne (Vir Linden) 4bbcd26941 SH-4061 FIX - texture fetch failures added retry logic and fault injection for testing 2013-04-08 18:16:58 -04:00
Brad Payne (Vir Linden) e16435c37c SH-4061 WIP - added ability to un-set missing asset, do this in the case of FTT_SERVER_BAKE images. This is needed because 'missing' is not necessarily permanent for such images. 2013-04-08 13:26:05 -04:00
Brad Payne (Vir Linden) 0a6a5f63b4 SH-4061 WIP - spelling fix, allow un-set of missing asset flag for textures 2013-04-05 13:44:33 -04:00
Don Kjer beeefb4526 Renaming HTTP_HEADER_* into HTTP_IN_HEADER_* and HTTP_OUT_HEADER_* to make it more clear which header strings should be used for incoming vs outgoing situations.
Using constants for commonly used llhttpnode context strings.
2013-04-04 21:50:45 +00:00
Brad Payne (Vir Linden) 7c37af37d4 merge 2013-04-03 11:28:00 -04:00
Brad Payne (Vir Linden) 0b5695fec1 merge 2013-04-02 20:42:41 -04:00
Brad Payne (Vir Linden) 72d0d81c7e SH-4057 FIX - cleaned up old canUseHTTP logic, now lives in llviewertexture.cpp 2013-04-02 20:40:19 -04:00
Nyx Linden af78acc037 merge 2013-04-02 18:33:26 -04:00
Nyx Linden 7ea7b236d8 BUILDFIX commit policy fixes 2013-04-02 18:32:57 -04:00
prep@lindenlab.com 96d87aa85e merge 2013-04-02 17:27:20 -05:00
prep@lindenlab.com ef6242d729 Merged in chui beta code. 2013-04-02 17:15:48 -05:00
Brad Payne (Vir Linden) 3eae5ba0d0 Removed setCanUseHTTP override in llvoavatar 2013-04-02 18:02:59 -04:00
Brad Payne (Vir Linden) e50a8b9a2b merge 2013-04-02 17:55:41 -04:00
Brad Payne (Vir Linden) 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
Nyx Linden 323a2f2235 pulling in sunshine-stable to sunshine-internal. 2013-04-02 16:02:13 -04:00
Logan Dethrow 557adcabb9 Renamed logCapabilites static function to log_capabilities in llviewerregion.cpp to better match coding standard. 2013-04-02 19:51:45 +00:00
Nyx Linden 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
Nyx Linden 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
AlexanderP ProductEngine 3f1ad7dbd0 CHUI-811 FIXED [CHUIBUG]Too much spacing around the new chat UI elements 2013-04-02 18:56:52 +03:00
Logan Dethrow 9927963ac9 If we get more caps from a subsequent grant for a region, go ahead and use them. This is a hack that should be safe to remove after SH-3895 is fixed everywhere on the sim side. 2013-04-01 20:10:39 -04:00
AlexanderP ProductEngine 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
Gilbert Gonzales 791040d03b merge 2013-04-01 17:12:47 -07:00
Gilbert Gonzales 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
Merov Linden c588f6be31 CHUI-907 : Fixed! Suppress inexistant menu item and duplicated registrar entry to avoid warning 2013-04-01 13:39:14 -07:00
Merov Linden cb4ec92582 CHUI-907 : Prevent warning when parsing menus adding name to menu_item_check 2013-04-01 13:04:24 -07:00
Mnikolenko ProductEngine 56939a2a2b CHUI-904 FIXED Set the focus on the Nearby chat floater after setting visibility. 2013-04-01 20:09:37 +03:00
mberezhnoy b3e3cf8151 merge 2013-04-01 20:06:23 +03:00
Logan Dethrow 298660a5f1 Backed out accidentally committed change to logcontrol.xml. 2013-04-01 11:59:27 -04:00
mberezhnoy 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
Merov Linden 2d84b0605e CHUI-807 : Trace add and remove sessions 2013-03-29 17:40:16 -07:00
Merov Linden 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
Nyx Linden adc4f8d02e merge 2013-03-29 18:06:05 -04:00
Nyx Linden 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
prep@lindenlab.com ab272c20a9 Another Chui beta6+ merge to deal with build issues 2013-03-29 13:22:51 -05:00
Mnikolenko ProductEngine 305d111910 Additional fix for CHUI-903 2013-03-29 18:34:16 +02:00
prep@lindenlab.com 0f24668b0a Merged in Chui beta6+ fixes 2013-03-29 10:37:58 -05:00
Mnikolenko ProductEngine a62a824efb CHUI-903 FIXED Don't show toasts if Session floater is torn-off and in focus. 2013-03-29 15:23:17 +02:00
Logan Dethrow 203da72c5f Automated merge with ssh://bitbucket.org/lindenlab/sunshine-internal 2013-03-28 18:08:11 -04:00
Logan Dethrow cfd35b8b22 Made a bug that was masking the warning about mismatched caps coming from a region. They could never match because certain capabilities are explicitly not stored when we receive them.
* Made mSecondCapabilitiesTracker set capabilities in a way that more closely matches mCapabilities so that they will match up when we get a second cap grant from a region if the caps that were sent are actually the same.
* Added more logging around setting a region's seed capability.
* Also added a static function in llviewerregion to dump out a CapabilityMap based on the logActiveCapabilities method. Defined the old method in terms of the new static free function.
2013-03-28 18:07:54 -04:00
AlexanderP ProductEngine 3b51f73b7c CHUI-799 FIXED Notification is not given to user when they select only friends and groups can IM me preference 2013-03-28 19:06:39 +02:00
prep 8e6d2f8ddc sh-4014: Don't send appearance updates while editing. 2013-03-28 11:43:12 -04:00
AlexanderP ProductEngine 8e3a85ed66 CHUI-896 FIXED Line flashing and FUI button flashing not working correctly for CHUI notifications: added flashing of the line item after conv. floater opens 2013-03-28 05:49:28 +02:00
Gilbert Gonzales e76a4eb7c5 CHUI-905 (Viewer crashes while using Insert keyboard key in chat): Problem was because when insert was used at the end of a string of text, this would attempt to delete something past the bounds of the string...as a side effect the size of the segment was increasing even though the string length never changed. The segment size would be greater than the string size and would eventually cause an invalid read outside the bounds of the string. 2013-03-28 17:31:45 -07:00
maksymsproductengine da8f2ffb16 CHUI-855 FIXED Text entry bar auto expand does not resize 2013-03-28 04:52:24 +02:00
AlexanderP ProductEngine 3a31b47028 CHUI-486 ADD FIX Update Preferences -> Chat XUI
1) when preference is "Pop up" - added toast according to Kurt's comment from 22/Dec/12;
2) fixed line item flashing and "Chat" button flashing in other cases according to original matrix.
2013-03-27 22:52:41 +02:00
Gilbert Gonzales b973e8566d merge 2013-03-27 17:28:43 -07:00
Gilbert Gonzales 2cb7218daf CHUI-875 (Viewer experiences a 10s delay on dnd (do not disturb) notification loading): For now adding logging when reading from persistent notifications and from dnd notifications. 2013-03-27 16:37:16 -07:00
Merov Linden dfa1426997 Pull merge from lindenlab/viewer-chui 2013-03-27 16:10:07 -07:00
Merov Linden 9f819806cd CHUI-901 : Fixed! Do touch torn off state in restoreFloater() 2013-03-27 16:08:03 -07:00
Gilbert Gonzales 9e3ec04b4b merge 2013-03-27 15:43:09 -07:00