Commit Graph

302 Commits (599107a0b4fbff5e23bccc4c5a7dbeb3c2f620e1)

Author SHA1 Message Date
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
andreykproductengine 62d9b8cbf2 Merge downstream code and become version 3.8.4 2015-08-18 16:42:48 +03:00
andreykproductengine e03c133750 Merge from viewer-relese and become version 3.8.2 2015-07-15 14:59:32 +03:00
andreykproductengine 4cf53872eb MAINT-5026 FIXED 256 prim linksets made of smaller prims frequently link only 254 2015-06-24 18:29:42 +03:00
andreykproductengine d092e375fd Merge downstream code and become version 3.8.2 2015-07-15 16:06:55 +03:00
andreykproductengine 1845816aa2 MAINT-5299 FIXED [MAINT-RC] Unlinking individual prims from a linkset no longer works 2015-06-25 16:36:38 +03:00
vyacheslavsproductengine 0a333e9a03 MAINT-3548 - FIXED-R2 Horizontal & vertical offset values for normal & specular maps still randomly revert to previous settings when building. 2015-05-19 19:28:03 +04:00
Mnikolenko ProductEngine 89321a56fd increment viewer version to 3.7.29 2015-04-28 12:03:31 +03:00
Mnikolenko ProductEngine bb87365c37 Merge viewer-release, become version 3.7.29 2015-04-28 13:36:35 +03:00
Brad Payne (Vir Linden) 76fb5f1542 merge with viewer tools update 2015-04-24 10:08:13 -04:00
Brad Payne (Vir Linden) d516a8729e merge 2015-04-13 17:20:36 -04:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
Brad Payne (Vir Linden) 6ac9852d54 MAINT-5069 WIP, MAINT-5071 WIP - handle dropping objects and attaching from ground. WIP on better tracking of attachment requests via various message in LLSelectMgr. 2015-04-09 13:29:39 -04:00
Mnikolenko ProductEngine 22ea223ddd MAINT-4904 FIXED Show confirmation pop-up before unlinking an object. 2015-02-26 12:12:08 +02:00
andreykproductengine 1cea21dcb9 MAINT-4700 FIXED Viewer cursor defaults to 'grab' mode when clicking on child prim of linkset that was recently physical and sat-upon 2014-12-01 19:31:09 +02:00
Mnikolenko ProductEngine f0db860b8a MAINT-1789 FIXED Object inspector doesn't show any information about object if user uses Select Only My Objects option 2014-11-18 17:22:02 +02:00
callum_linden 577a3973ea Update to build on Xcode 6.0: Large (and final) collection of fixes for unused variables, unused const-variables, unused member variables & functions etc. Also removed flags from CMake 2014-10-20 14:00:39 -07:00
callum_linden 5894e380b7 Update to build on Xcode 6.0: clang demands logical comparison brackets 2014-10-20 10:48:30 -07:00
andreykproductengine a9692c233e MAINT-3202 FIXED Cancel of selected colour in "Colour picker" floater does not return colour icon to previous condition 2014-10-10 09:20:42 +03:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
Xiaohong Bao 24a6396cd7 fix a mouse hovering crash. 2013-11-21 16:44:07 -07:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Richard Linden 59628d6f85 Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-10-01 14:28:39 -07:00
Dave Parks 0ab4e11223 Fix for random bad colors in UI on Intel HD 4000 2013-10-08 14:43:10 -05:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden a2e22732f1 Summer cleaning - removed a lot of llcommon dependencies to speed up build times
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Richard Linden a2a6bf20d7 merge with release 2013-06-20 16:46:23 -07:00
Graham Linden 65f0972a64 NORSPEC-262 make drag and drop aware of editing context so that editing normal/spec textures causes application to the correct tex channel 2013-06-20 12:41:46 -07:00
Graham Madarasz 7e4e59470f NORSPEC-233 WIP for individual material param edits across hetero object selections 2013-06-07 08:58:15 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Graham Madarasz 8d4594cd11 NORSPEC-96 diff/norm/spec tex scale ratio rodeo, yo 2013-05-29 19:10:53 -07:00
Graham Madarasz 66e5375967 NORSPEC-96 NORSPEC-189 another attempt at planar stretch across all 3 channels and make the materials CB use a UUID instead of this pointer for safety 2013-05-24 15:07:23 -07:00
Graham Madarasz 8b7a4c503c NORSPEC-96 tweak fix to follow clone/modify/re-apply pattern from build tool to avoid changing objects sharing a material 2013-05-21 17:09:04 -07:00
Graham Madarasz d187ee8e59 NORSPEC-96 slight refrain, make Stretch Textures apply to norm/spec maps in planar texgen mode 2013-05-21 16:51:36 -07:00
Graham Madarasz c46b24fc9a Merge 2013-05-15 16:26:05 -07:00
Graham Madarasz a37bff8bf1 NORSPEC-103 reflect normal/spec UVs in face edit overlay display 2013-05-14 15:26:43 -07:00
Kitty Barnett ad09e2111c NORSPEC-102 & Co Reloaded 2013-05-14 21:14:46 +02:00
Graham Madarasz d9e8ee7cfd NORSPEC-178 NORSPEC-179 NORSPEC-180 made enable/disable handling more consistent and increased max range on repeats per meter 2013-05-13 13:02:53 -07:00
Kitty Barnett 5ac9d9cb05 LLMaterialMgr::get() doesn't handle a callback request for LLMaterialID::null 2013-05-12 16:10:31 +02:00
Graham Madarasz f356d7eb9f Fix many issues with selection misapplication and rendering not matching applied materials 2013-05-11 19:58:56 -07:00
Graham Madarasz fd447189c5 Merge 3.5.1 into Materials 2013-04-25 21:00:16 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz (Graham Linden) 6a417acd63 NORSPEC-92 More UI fixes 2013-04-10 10:23:03 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Richard Linden 68f9f656cd merge with viewer-release 2013-03-22 00:44:59 -07:00
Tonya Souther 8b24857f6a Dynamically add and remove "Use texture" normal/specular setting. 2013-03-09 16:11:55 -06:00
Brad Payne (Vir Linden) 5a436e46f6 SH-3959 WIP - pass information about type of fetched image - server bake, host bake, map tile, etc - down the chain so LLTextureFetchWorker can adjust behavior as needed 2013-03-08 17:07:17 -05:00
Richard Linden f07b9c2c69 renamed LLTrace stat gathering classes/methods to make the structure of LLTrace clearer
Count becomes CountStatHandle
Count.sum becomes sum(Count, value), etc.
2013-03-06 11:08:25 -08:00
Tonya Souther 2eaf35b946 Clear face's material ID internally when removing the material. 2013-02-28 07:44:45 -06:00
Tonya Souther fa7dd43308 Wire up LLMaterialMgr::remove() to edit panel. 2013-02-27 19:27:46 -06:00