Commit Graph

32973 Commits (07af9656c3ec0dccfc2ebf86f23bd664c19d8395)

Author SHA1 Message Date
maksymsproductengine fa9097b65f Merge changes for 3.7.20-release 2014-11-11 02:32:39 +02:00
Brad Payne (Vir Linden) c977268ff5 merge 2014-11-10 15:12:12 -05:00
Monty Brandenberg f135fd6f14 Merge. Refresh from viewer-release after 3.7.20 released. 2014-11-10 14:57:55 -05:00
Oz Linden b66c719060 merge changes for 3.7.20-release 2014-11-10 14:43:05 -05:00
Oz Linden 2301cf800f increment viewer version to 3.7.21 2014-11-10 14:41:41 -05:00
Oz Linden 3cbba871c2 Added tag 3.7.20-release for changeset 27094824773b 2014-11-10 14:41:41 -05:00
andreykproductengine c0ae1fe956 MAINT-4617 FIXED Viewer chews on "Inventory->Open and Select" until inventory received or recent items selected 2014-11-10 17:20:03 +02:00
Mnikolenko ProductEngine 815cfa5060 MAINT-1333 FIXED Disable "for sale" controls for attached prim 2014-11-07 16:29:32 +02:00
Monty Brandenberg de9689e39b BUG-7698, BUG-7688, BUG-7694 (others) CDN connection issues.
Under pipelining, requests were given a 5x timeout factor due to the
way that the timeout clock works in libcurl.  Under CDN load,
connections were not being torn down quickly and it was only
this timer that led to disconnect and retry.  So, we want to
break a connection that isn't making progress but that isn't
immediately possible.  We'll compromise with a 60S timeout that
(we hope) will be neither too long for stalled connections nor
too short for large asset transfer requests.
2014-11-06 16:39:40 -05:00
andreykproductengine 811878df66 MAINT-202 FIXED Can't open scripts in copied objects individually on the viewer2 2014-11-05 17:52:14 +02:00
Mnikolenko ProductEngine 034cb895bd MAINT-3067 FIXED Show context menu when right clicking avatar name in the list. Bumps, Pushes and Hits moved to Help from Develop menu 2014-11-06 11:36:21 +02:00
Mnikolenko ProductEngine ae04cb8549 MAINT-4621 FIXED start new session with the caller (if it doesn't exist) and only then show autoreject message 2014-11-05 12:36:56 +02:00
simon fa7610fea5 Merge downstream code and become 3.7.20 2014-11-03 17:54:24 -08:00
Brad Payne (Vir Linden) 90e862c7ce merge 2014-11-03 16:19:27 -05:00
simon a669303f85 Pull in viewer-release and become version 3.7.20 2014-11-03 11:56:09 -08:00
ruslantproductengine 799d13269a MAINT-3585 FIXED Viewer Crashes when attempting to upload image.
The bug was fixed, the reasone of crash is following. The Core Flow view
contain another GL context and will not care about restoring a previous.
I restore context manually.
This path also contain a minor changes in another files.

All changes described here.

Сhange's for fix current bug.
indra/llwindow/llwindow.h
indra/llwindow/llwindowheadless.h
indra/llwindow/llwindowmacosx.h
indra/llwindow/llwindowsdl.h
indra/llwindow/llwindowwin32.h
indra/newview/lllocalbitmaps.cpp
indra/newview/llviewerdisplay.cpp
indra/newview/llviewerdisplay.h

Twice mUsage initialization (replace to forward initialization).
indra/llcharacter/lljointstate.h

Looks like condition should be befor memcopy call, otherwise - possible CRASH.
indra/llcommon/llmd5.cpp

Unused condition and variables.
indra/llmath/llsphere.cpp

Looks like should be under if otherwise - possible CRASH
indra\llprimitive\llmodel.cpp

Useless assert's.
indra/llrender/llrender.cpp
indra/newview/lldaycyclemanager.cpp
2014-11-03 20:05:20 +02:00
Mnikolenko ProductEngine f3d73d9e72 MAINT-4499 FIXED Forgotten password button is not aligned with Password input field 2014-11-04 13:54:11 +02:00
Mnikolenko ProductEngine 5ccf4a4252 MAINT-4581 FIXED Flickr slurl links break on some regions with spaces in the region name 2014-11-04 13:09:26 +02:00
Mnikolenko ProductEngine b1ef5dee93 MAINT-4619 FIXED Using Align Planar Faces on flexible prims causes viewer to crash 2014-11-04 13:07:14 +02:00
simon 3b50cdd74c Merge downstream code and become 3.7.20 2014-11-03 18:02:49 -08:00
andreykproductengine 0ffecdcfb2 MAINT-1884 FIXED "Shortcut Key" text label is overlapped by drop-down lists in Preview floater when user opened more then one gesture 2014-11-03 19:32:27 +02:00
Brad Payne (Vir Linden) 7fec81b102 SL-93 WIP - pelvis fixup offsets 2014-11-03 05:46:31 -05:00
Brad Payne (Vir Linden) 90aca8f95a settings.xml update 2014-10-31 13:24:20 -04:00
Brad Payne (Vir Linden) 535e24c7e8 SL-93 WIP - missing include 2014-10-30 14:04:18 -04:00
andreykproductengine 0ab5b90e4b MAINT-4617 FIXED Viewer chews on "Inventory->Open and Select" until inventory received or recent items selected 2014-10-30 19:02:06 +02:00
Mnikolenko ProductEngine 70a53351b1 MAINT-3560 FIXED Unused setting MaxFPS was deleted 2014-10-31 15:50:20 +02:00
Brad Payne (Vir Linden) 58e2d58daf SL-93 - WIP on managing pelvis fixups using new joint offset framework 2014-10-30 04:20:12 -04:00
Oz Linden 05896f4f04 merge changes for MAINT-4560 2014-10-29 16:15:57 -04:00
ruslantproductengine edb7e3450f MAINT-4435 FIXED build fix patchset2 2014-10-28 17:12:49 +02:00
Oz Linden cd0774a217 merge changes for 3.7.19-release 2014-10-28 10:01:40 -04:00
Oz Linden fe89c9ed76 merge changes for 3.7.19-release 2014-10-28 09:56:57 -04:00
Oz Linden 02e2235277 increment viewer version to 3.7.20 2014-10-28 09:55:55 -04:00
Oz Linden 7c0a06f1be Added tag 3.7.19-release for changeset 82973b38a6c9 2014-10-28 09:55:54 -04:00
andreykproductengine 3d9406a21e MAINT-2759 FIXED Touch is greyed out when right clicking on child prims in a touchable linkset if the script uses a reset on rez 2014-10-27 16:21:44 +02:00
ruslantproductengine 366bcd0cbc MAINT-4435 FIXED fix in llvolume.cpp Perform full build if number of vertices
less than allowed. Changes in all other files relate auxiliary methods for
catching similar bugs in future.
2014-10-27 17:10:08 +02:00
Mnikolenko ProductEngine e3f62a54e6 MAINT-4597 FIXED Show emoted name according to name settings in preferences. 2014-10-27 13:26:17 +02:00
simon d524c76822 MAINT-4614 - fix viewer warning about bad membership list update 2014-10-24 12:23:26 -07:00
andreykproductengine 4f5ea39c91 MAINT-3208 FIXED Confusing button state when working with multiple textures and the default texture is the last selected. 2014-10-24 17:39:12 +03:00
Mnikolenko ProductEngine cfddb46b00 MAINT-4554 FIXED Display owner as [groupname] (group) for group-owned object 2014-10-24 13:38:52 +03:00
Oz Linden a837281a77 merge changes for STORM-2081 2014-10-23 16:07:31 -04:00
Cinder 47854b6218 STORM-2081 - Guard against null gWindowImplementation when fullscreen (crashes OS X Yosemite) 2014-10-23 12:45:05 -06:00
andreykproductengine bf3d017b69 MAINT-2131 FIXED "Copy" menu item is enabled for folders in "My inventory" panel inside "Places>My Landmarks" tab 2014-10-23 15:59:15 +03:00
MNikolenko ProductEngine 5c3d8de4a5 MAINT-4602 FIXED URLs are not highlighted as URLs in chat view when preceding an internal URL 2014-10-22 19:37:15 +03:00
Oz Linden 075c53cf31 merge changes for 3.7.18-release 2014-10-21 13:58:29 -04:00
Oz Linden 286ed4a4c2 merge changes for 3.7.18-release 2014-10-21 11:25:44 -04:00
simon 696e64235a Merge downsteam code and become version 3.7.19 2014-10-20 13:56:02 -07:00
simon 4b333e36d1 Merge downsteam code and become version 3.7.19 2014-10-20 13:54:37 -07:00
simon 61be636a10 Merge downsteam viewer-release and become version 3.7.19 2014-10-20 13:52:23 -07:00
Monty Brandenberg 80f93392ea Merge. Refresh from viewer-release after 3.7.18 release. 2014-10-20 15:01:03 -04:00
Oz Linden 920b6de4b1 increment viewer version to 3.7.19 2014-10-20 14:34:53 -04:00