Merov Linden
2939a542f9
DD-272 : Be more consistent when updating the count on hand in SLM, also prevent multiple folder update when receiving data from SLM
2014-11-07 16:47:19 -08:00
Mnikolenko ProductEngine
dbbf9ccd32
ACME-1598 FIXED Problems with scroll bar in experiences tab
2014-11-07 18:22:27 +02:00
Mnikolenko ProductEngine
815cfa5060
MAINT-1333 FIXED Disable "for sale" controls for attached prim
2014-11-07 16:29:32 +02:00
dolphin
fb9e603e34
Merge with 3.7.19-release
2014-11-06 16:27:14 -08:00
dolphin
c2a516aee1
ACME-1635: Trusted Experiences now referred to as Key Experiences.
2014-11-06 16:25:17 -08: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
Brad Payne (Vir Linden)
13b4909a3c
merge
2014-11-05 10:52:23 -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
Merov Linden
1f23a35a2c
DD-235 : Use newly built jsoncpp libraries that do include the security fix
2014-11-03 16:28:04 -08:00
Brad Payne (Vir Linden)
90e862c7ce
merge
2014-11-03 16:19:27 -05:00
Merov Linden
828f478921
DD-263 : Update the count on hand on SLM in various situation where stock count changes (activate, drag/drop, associate, etc...)
2014-11-03 13:18:06 -08: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
4a329b3919
fix signature target path
2014-10-29 18:42:43 -04:00
Oz Linden
aa7c939a6b
reorder finalizing for OSX so that the signature is applied to the app after copying into the dmg; preserves extended attributes
2014-10-29 18:34:14 -04:00
Oz Linden
05896f4f04
merge changes for MAINT-4560
2014-10-29 16:15:57 -04:00
JJ Linden
8530ca0b3d
fix for formatting issue
2014-10-28 18:31:07 -07:00
JJ Linden
bfd7878d9a
adding line to test that app was signed appropriately
2014-10-28 16:47:20 -07:00
dolphin
8cc8e7dc77
ACME-1601: Updated message to match behavior
...
ACME-1616: Change references of "Grid-Wide" to "Grid-Scope" and "non Grid-Wide"
to "Land-Scope"
2014-10-28 11:43:45 -07:00
Oz Linden
a44d76e66b
merge update from callum
2014-10-28 14:24:19 -04:00
Oz Linden
7a2cfdc980
add --deep to codesign for the mac
2014-10-28 11:22:48 -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
callum_linden
c26f41992a
Merge with head
2014-10-27 13:17:12 -07:00
callum_linden
57ef98e0ba
Remove obselete TO DO list
2014-10-27 13:16:39 -07:00
Oz Linden
6c53ae5398
fix build of llphysicsextensions package for sublicensed tpvs
2014-10-27 12:54:32 -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
Merov Linden
0291b82f94
DD-243 : Set up callbacks for merchant outbox importer in the postBuild
2014-10-24 22:46:26 -07:00
Oz Linden
353e27491b
update llphysicsextension with build fixes
2014-10-24 22:56:40 -04:00
Merov Linden
b630544159
DD-242 : Added beta invitation message to merchants in the marketplace listings floater
2014-10-24 15:30:50 -07:00
simon
d524c76822
MAINT-4614 - fix viewer warning about bad membership list update
2014-10-24 12:23:26 -07:00