Commit Graph

28 Commits (52d9b075035309c4771fe09d96e4da3b5224ec96)

Author SHA1 Message Date
Graham Linden f782e01920 NORSPEC-267 fix UI feedback for materials edits not appearing for observers when obj was selected by them 2013-06-15 05:18:50 -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
Kitty Barnett 6fd7f146d4 Merged with viewer-dev-materials 2013-05-12 12:39:52 +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
Kitty Barnett 269b8b7de5 NORSPEC-102 Rapid materials updates are not smooth to viewer which is editing the object 2013-05-10 10:50:50 +02:00
Graham Madarasz 5aa3f3c808 NORSPEC-164 fix TE copy ctor and operator= to include material pointer in addition to ID 2013-05-09 15:41:07 -07:00
Graham Madarasz fd447189c5 Merge 3.5.1 into Materials 2013-04-25 21:00:16 -07:00
Dave Parks f189ba4a3d NORSPEC-71 Lots more UI hookups
Written with and Reviewed By Graham
2013-04-03 16:56:59 -05:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Geenz 5f03e197f4 Trying to set materials up for rendering! Yay! 2013-01-25 17:54:38 -05:00
William Todd Stinson 38a565f71a Initial pass at getting a list of viewer objects with non-null material IDs. 2012-10-09 12:30:38 -07:00
Merov Linden 16443c4df3 STORM-1001 : Fix ObjectMedia cap flooding (Fix by Kitty Barnett) 2011-03-11 15:09:44 -08:00
Xiaohong Bao 8dad2e56f3 fix for SH-416: crash at LLFace::getGeometryVolume line 1003 2010-12-23 11:42:17 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
brad kittenbrink 50247533f9 Merged latest viewer/login-api with latest viewer/viewer-20 2009-10-07 17:51:28 -07:00
Rick Pasetto aba67da38b FIX DEV-40877: ignore changes from "bad" objects which have an invalid media URL 2009-10-05 18:14:27 -07:00
Mark Palange (Mani) 4d53e235c2 merge of latest viewer/viewer-20 2009-10-02 10:35:42 -07:00
Monroe Williams cf9239cabc svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
2009-10-01 02:35:53 +00:00
Brad Kittenbrink 01d390825a DEV-27646 dll linkage for login module.
Ok, finally got this to a point where it doesn't break the build and I can check
in. llcommon can be built as a shared library (disabled but can be enabled with
cmake cache var LLCOMMON_LINK_SHARED.

reviewed by Mani on tuesday (I still need to get his suggested changes
re-reviewed)
2009-05-22 23:27:16 +00:00
Andrew Meadows 3d4e04b556 QAR-1284 ip-takedown tools simulator work is ready for merge
svn merge -r115879:116020 svn+ssh://svn.lindenlab.com/svn/linden/branches/dmcat/dmcat-5
no conflicts
2009-04-01 17:11:37 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Brad Kittenbrink 6d52efe452 Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).

svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2008-02-27 18:58:14 +00:00
Aaron Brashears 5595a99623 Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
Karl Steifvater b699ae454d merge -r67812:67818 svn+ssh://svn.lindenlab.com/svn/linden/branches/windlight-server/ --> release 2007-08-16 00:59:41 +00:00
Brad Kittenbrink 029130bf9c svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release 2007-05-23 21:17:34 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00