livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,478 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

42 Commits (68739bc569ad7e7c83f34c4e8a480f65c5e68e34)

Author SHA1 Message Date
Ansariel 68739bc569 Merge Viewer-Bear 2015-10-27 01:31:15 +01:00
AndreyL ProductEngine 67757ddd5b MAINT-5416 FIXED Cannot right-click a rigged mesh that's worn 
--HG--
branch : maint-5416
 2015-09-04 21:06:22 +03:00
AndreyL ProductEngine 57904b4def MAINT-5416 Reverted changeset: 9bd24c17d908 2015-07-23 23:59:05 +03:00
AndreyL ProductEngine 269cc894a9 MAINT-5416 FIXED cannot right-click a rigged mesh that's worn 2015-07-17 07:31:36 +03:00
Ansariel 404f4a7845 FIRE-12964: Manual pull of MAINT-3800 because it interferes with rigged mesh attachment selection 
Also adjust calls of pickImmediate and pickAsync methods to account particle selection that was added after rigged mesh attachment selection
 2015-04-06 20:21:50 +02:00
Ansariel 6f89dbb860 FIRE-15653: Prevent cheating around RLVa @editobj restriction 2015-03-02 15:29:35 +01:00
Ansariel 48fc17d6e1 Merge LL V3.7.16 2015-01-14 17:36:30 +01:00
simon a5568f942b Merge downstream version 3.7.8 code 2014-05-07 15:28:13 -07:00
andreykproductengine 508487bdee MAINT-459 FIXED Cannot delete prim displaying media 
Fixed interaction with unselected faces while media is selected.
 2014-04-07 18:36:02 +03:00
Ansariel 1ee3e3f817 FIRE-14593: Option to select only copyable objects 2014-12-15 10:44:06 +01:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Ansariel a6e424db72 FIRE-8039: Option to prevent avatar from turning to selected object 2014-04-10 14:22:53 +02:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Richard Linden 6b81b8629e Spring cleaning: removed unused .cpp and.h files, and cleaned up header dependencies 2013-05-05 17:45:35 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Kitty Barnett 24d4b821ff - fixed : can't right-click rigged mesh attachments to detach them 2012-07-13 15:36:47 +02:00
Kitty Barnett 5ce6686f07 - fixed : clicking on terrain doesn't deselect all currently selected objects 
-> RlvHandler::canEdit(NULL) returns 'true'

--HG--
branch : RLVa
 2012-10-10 19:14:18 +02:00
Kitty Barnett 248f170412 - internal : disable/enable the new toolbar buttons based on currently active restrictions 
--HG--
branch : RLVa
 2011-11-07 16:04:59 +01:00
Kitty Barnett f84126fa22 - added : @edit:<uuid>=n|y and @editobj:<uuid>=n|y 
--HG--
branch : RLVa
 2010-11-29 23:14:36 +01:00
Kitty Barnett b6a073c659 Initial commit of RLVa-1.2.0i 
--HG--
branch : RLVa
 2010-08-22 10:57:22 +02:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Loren Shih 58d76a9ecf EXT-6536 : Make LLVOAvatarSelf a singleton 
Superficial cleanup to replace all instances of "gAgentAvatar" with "gAgentAvatarp".
 2010-03-29 12:11:51 -04:00
Loren Shih 94e6e10739 EXT-6536 : Make LLVOAvatarSelf a singleton 
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
 2010-03-29 12:00:26 -04:00
Loren Shih fc49539b36 EXT-2959 : Full out camera functions from llagent to llagentcamera 
First check-in; only compiles, nothing more.
 2010-03-23 15:59:52 -04:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 
ignore-dead-branch
 2009-06-21 08:04:56 +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
Steven Bennetts 80be4c1d2d QAR-767 Combined maint-render-7 and maint-viewer-9 merge 
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
 2008-08-12 17:29:50 +00:00
Karl Steifvater 52562e2e66 svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 
QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL
 2008-07-23 21:20:19 +00:00
Josh Bell 35b4a91129 svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> release 
Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation.
 2008-07-22 20:55:02 +00:00
Karl Steifvater df4f20d4f5 merge uv-picking branch. 
svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4
 2008-07-22 20:12:37 +00:00
Steven Bennetts 25c10ed028 QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 
dataserver-is-deprecated
 2008-06-26 00:39:00 +00:00
Steven Bennetts 941cb9f412 merge release@83343 skinning-1-merge@83714 -> release 
QAR-424
 2008-04-01 17:45:04 +00:00
Steven Bennetts 2e32d44e71 merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 
QAR-290 = QAR-271 + QAR-191
 2008-02-19 21:42:32 +00:00
Steven Bennetts 050dad0ce3 merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079 2007-11-07 22:55:27 +00:00
Don Kjer 1b550aaec2 EFFECTIVE MERGE: svn merge -r 69928:70806 svn+ssh://svn/svn/linden/branches/maintenance-1 && svn merge -r 70948:70949 svn+ssh://svn/svn/linden/branches/maintenance-1-qa into release 
ACTUAL MERGE: svn merge -r 71430:71431 svn+ssh://svn/svn/linden/qa/maintenance-1-merge-71429 into release
 2007-10-11 00:28:42 +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
Bryan O'Sullivan ce7682c2a4 svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 
(only inside indra)

(josh) Original log message was:
   svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
   svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
   svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
 2007-07-18 21:22:40 +00:00
Kelly Washington e03bb0606a merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
Steven Bennetts 647d29b1a2 merge -r 58285:58437 maintenance. 2007-02-27 01:03:39 +00:00
Richard Nelson 73bc0fb42b merge -r 56779:58057 /branches/selection_management 2007-02-17 03:02:16 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00