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

26 Commits (e92d3dcf1013ab340fdef514b41ebf790f79e04c)

Author SHA1 Message Date
Vadim ProductEngine 0eb491417e STORM-806 FIXED Enabled external editor for inventory scripts. 
Changes:
* Moved external editor handling to LLScriptEdCore which is shared between
  LLLiveLSLEditor (object script editor) and LLPreviewLSL (inventory script editor).
* The Edit button is now only enabled when appropriate.
 2010-12-22 21:48:42 +02:00
Vadim ProductEngine b2fcba25c8 STORM-52 FIXED Made it possible to use an external script editor. 
The editor can be specified:
* via "ExternalEditor" setting in settings.xml
* via LL_SCRIPT_EDITOR variable

Removed obsolete XUIEditor setting in favor of the new one.
 2010-11-13 00:53:29 +02:00
Kelly Washington f3b01596dd VWR-21377 Script editor ctrl-f fix. 
change to better / more consistent naming
 2010-09-24 16:31:43 -07:00
Kelly Washington 0931799f03 VWR-21377 Script editor ctrl-f fix. 
let some LLViews handle shortcut keys if they want.
reviewed with ambroff
 2010-09-24 15:57: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 256b8aba31 Fixed some more header file usage after the recent rebasing of my old precompiled header work. 2009-12-02 20:20:12 -08:00
Loren Shih acdce23299 Header file cleanup 
Removed unnecessary "#include llinventorymodel.h" now that llinventoryobserver was split from llinventorymodel.

--HG--
branch : avatar-pipeline
 2009-11-13 17:47:00 -05:00
Adam Moss feabeb4965 DEV-35039 Viewer 2.0 Help System - Viewer Development 
svn merge -r134800:134805 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer2help-3
 2009-09-30 17:46:31 +00: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
Adam Moss b01c75cb42 svn merge -r117314:117337 
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1

QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
 2009-04-16 23:45:35 +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
Kent Quirk 667ca55bad svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
James Cook b406972af1 svn merge -r100302:100467 installer-james-combo-merge for QAR-972, incorporating: 
QAR-892 Windows installer that pings secondlife.com on launch
QAR-837 Six New Languages in the Installer
QAR-908 downloader-support-1 merge
 2008-10-28 23:56:20 +00:00
Dave Hiller 9a7d68cfce svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated 2008-07-31 12:15:15 +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
Don Kjer facf67ae32 EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release 
ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
 2007-12-05 23:43:56 +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
Don Kjer 13c391f198 EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/maintenance 
ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
 2007-09-14 21:13:20 +00:00
Christian Goetze ce0a5fe145 EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release 
Actual action: branched maintenance-r68118, merged in release, then copied result into release
 2007-08-21 22:17:53 +00:00
Richard Nelson 2ce0fc5f18 svn merge -r 59234:60086 svn+ssh://svn/svn/linden/branches/live_lsl_help2 -> release 2007-04-05 00:59:55 +00:00
Josh Bell 00dbacb215 svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate@59163 --> release 2007-03-14 23:03:50 +00:00
Steven Bennetts d1582a5105 merge -r 57111:57464 maintenance. 2007-02-05 20:20:42 +00:00
Aaron Brashears 305c74d516 Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release. 2007-02-02 17:28:58 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00