Commit Graph

271 Commits (bfe520387ed3061ba55ea2e58c565016e7a3159e)

Author SHA1 Message Date
Dave Parks 0ab4e11223 Fix for random bad colors in UI on Intel HD 4000 2013-10-08 14:43:10 -05: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
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
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
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
Oz Linden 8bb3d0891d merge up to 3.4.5-release 2013-02-12 13:27:03 -05:00
Tonya Souther 3422f75cf7 Tell the renderer to use the updated material immediately on editing it. 2013-02-06 21:38:05 -06:00
Tonya Souther c1b110dd1d Merging in main repository. 2013-01-31 11:40:16 -06:00
Tonya Souther d53f69b67f Control reorganization and bugfixes. 2013-01-31 00:36:23 -06:00
Geenz 071a53c814 Merge with latest viewer-dev-materials. 2013-01-30 12:45:26 -05:00
Tonya Souther 1751c965ba Editing interface for normal and specular maps and other parameters. 2013-01-29 21:19:58 -06:00
Geenz 5f03e197f4 Trying to set materials up for rendering! Yay! 2013-01-25 17:54:38 -05:00
Nyx Linden 11fe124ae9 merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
Kelly Washington d41eaa2e3d MAINT-1743 "Use Selection for Grid" does not change the grid ruler to "Reference"
in the tools floater
Reviewed with Simon.
2012-10-25 09:54:04 -07:00
Kelly Washington ffc33a1cc5 MAINT-1598 Edit Linked Parts isn't returning creator/owner
* Show creator, owner and group information when only selecting a single prim
  in a linkset.
reviewed with Simon
2012-10-15 16:46:42 -07:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
simon@Simon-PC.lindenlab.com 5f75cf5777 MAINT-1526 : Save Back to Inventory has been disabled on server side but
stays in UI.  Removed it.  Reviewed by Kelly
2012-10-02 09:30:56 -07:00
Don Kjer 1f6e20c5bb Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture 2012-09-04 17:43:08 +00:00
simon@Simon-PC.lindenlab.com 83f5d0c616 Merge in viewer-development 2012-07-31 15:42:02 -07:00
Todd Stinson 4feef5af63 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-23 19:21:34 -07:00
Todd Stinson eb00239a0b PATH-807: Ensuring that the "Show in linksets..." and "Show in characters..." right-click menu option does not show for objects outside the current region. 2012-07-12 14:47:47 -07:00
Todd Stinson 90fdf60d69 PATH-807: Adding an additional check for if the object is marked as volume-detect. Note that this will require Andrew's corresponding server-side change to take effect. However, the viewer change alone should have no neative effect prior to the server being updated. 2012-07-12 14:12:58 -07:00
Todd Stinson 34d95fdc01 PATH-807: BUGFIX Filtering which objects will contain the right-click context-sensitive menu option of "Show in linksets...". 2012-07-10 18:29:22 -07:00
Todd Stinson 6e710333e7 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-06-22 18:59:31 -07:00
Todd Stinson 1ca92d37dd PATH-760: Adding another pathfinding test method to the selection manager. 2012-06-22 11:24:23 -07:00
Todd Stinson f143da27bf PATH-760: Ensuring that the pathfinding attribute field works correctly with multiple objects selected. 2012-06-21 18:03:23 -07:00
Todd Stinson aea6b0c70c PATH-760: Renaming some methods of LLSelectMgr. 2012-06-21 17:29:12 -07:00
Dave Parks 029103133e MAINT-794 Factor out a lot of CPU overhead around updating objects. 2012-06-19 18:08:39 -05:00
Paul ProductEngine 890c583289 MAINT-119 FIXED (PUBLIC]no-transfer textures not searchable via texture picker)
- Implemented Richard's and Leo's spec
- Also fixed an issue when applying no-transfer texture for an object using texture picker, creates redundant copies of the texture in the object's content
2012-05-22 20:01:22 +03:00
Todd Stinson c1a5d6a36b PATH-450: Disabling the movement and shape manipulation widgets when editing an item in a linked set. 2012-03-30 15:42:43 -07:00
Todd Stinson fcda925072 PATH-450: BUGFIX Ensuring that permanent objects cannot be linked in frozen mode. Displaying a modal notification if user attempts. 2012-03-29 18:07:40 -07:00
simon_linden e4ed409ec3 MAINT-853: Audit sendListToRegions() function calls and fix memory leaks.
Reviewed by Kelly
2012-03-27 09:37:04 -07:00
simon@Simon-PC.lindenlab.com ca40352950 MAINT-852 / VWR-8761 : Cannot delete object description. Now you can. Reviewed
by Kelly.
2012-03-26 16:23:53 -07:00
Todd Stinson f0dafcfc7c PATH-199: Disabling the Take and Delete right-click context menu options when object is enforced permanent. 2012-03-23 17:47:40 -07:00