1714747536
After merge compare FS tree agsindt V/dev.
...
- Adjust whitespaces/include order to make FS source look as close to V/dev as possible.
- Include source in V/dev that's not in FS and comment it out with an annotation.
2012-01-18 19:04:59 +01:00
161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
ce6bd89ca4
Changes per Oz's suggestion on RB.
2012-01-04 15:16:35 +00:00
04d5ba4ab9
General cleanup of new code (removing commented lines, experimetal stuff), adding some comments per RB feedback.
2011-12-09 09:51:25 +00:00
468543c944
Reverting the changes to default script which leaked in from another project ;-)
2011-12-08 10:33:23 +00:00
413cd15f07
Fixed accidental change to HELLO_WORLD script.
2011-11-24 12:48:17 +00:00
eeefec394c
Changes to filter out tabs from file load and to test if loading/saving should be allowed.
2011-11-23 01:30:15 +00:00
b28492fbff
STORM-1708 Adding ability to save/load scripts from file.
2011-11-17 23:17:26 +00:00
eef9b265b9
STORM-1018 FIXED Improved error messaging for the External Editor feature.
...
Let the user know what's wrong with external editor.
Added meaningful messages for the following errors:
* Editor not specified.
* Error parsing command line.
* Specified binary not found.
* Editor failed to run.
All the messages are translatable.
2011-03-07 19:18:31 +02:00
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
37cd8ad2a2
STORM-781 FIXED Added support for editing multiple scripts within inventory of the same object using external editor.
...
The bug was caused by using the object ID as temporary file name for editing script,
which of course didn't work for multiple scripts in the same object inventory.
The fix is to use MD5("object id" + "script inventory item id") for the file name.
2010-12-13 13:38:46 +02:00
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
7aa1261f56
More controls caching for performance. Script editor and LLScrollListCtrl.
2011-12-04 02:03:45 +01:00
d54280797e
Allow programmatically creating scripts to mono
2011-10-11 22:52:08 -04:00
4479eed539
Fixed script editor not showing when script save has completed. Fixes FIRE-1365
2011-10-06 14:56:04 +02:00
57090ae504
FIRE-1599 Add textsearch to Notecards, patch submitted by Satomi Ahn and Kitty Barnett
2011-09-15 21:08:45 +02:00
61cb88c510
Mini-merge up to FS-tip. Note: Reverted OSX Lion build sdk changes, due to failure to produce a viable build on snowleopard.
2011-08-05 11:35:59 -04:00
e277b8a4ac
Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins.
2011-08-04 11:53:40 -04:00
613d021289
Add preference to compile scripts directly from inventory as Mono instead of LSL. Interim fix for FIRE-1585 until the full LSL preprocessor is done; possible fix for FIRE-1619.
2011-07-15 21:57:23 -05:00
dadbdecb4d
Merged with default tip
2011-06-11 11:10:39 +02:00
fe65635b91
//TT Client LSL bridge for script access
2011-06-09 01:49:22 -04:00
825d5bc58e
Merged with RLVa-1.3.1c
2011-06-03 21:38:34 +02:00
c80812fb9f
- internal : header dependency cleanup for rlvcommon.h and rlvhandler.h
...
--HG--
branch : RLVa
2011-05-22 11:34:34 +02:00
10e88f3891
Merge with RLVa-LL2.5.2
2011-04-09 22:24:22 -07:00
604345b918
Merged with .RLVa tip
...
--HG--
branch : RLVa
2011-02-19 01:12:23 +01:00
0586dca369
Merge up part2 to Release 2.4.0 + RLVa . Needs live testing
2011-01-19 12:40:31 -05:00
d3153238a6
FIRE-119 VWR-23608 Satomi Ahn Return key not working when search text is focussed in script search
2010-12-11 19:32:02 -05:00
c1e2223e50
Merged with default tip (Revision dc6483491b4a)
...
--HG--
branch : RLVa
2010-12-05 01:50:09 +01:00
0d6fd16a14
- added : generic "Unable to perform action due to RLV restrictions" notification
...
-> added for the live script editor
--HG--
branch : RLVa
2010-11-25 15:55:24 +01:00
b64de5e276
- fixed : crash when attempting to save a script while the object is "out of range" (thankies crash reporter)
...
--HG--
branch : RLVa
2010-11-25 15:08:40 +01:00
5cfc22c3c8
Merge from ll snowstorm
2010-11-17 10:34:44 -08:00
1c2ef4090a
Merged with default tip (Revision f20bf424bd86)
...
--HG--
branch : RLVa
2010-10-30 17:28:00 +02:00
fb0034e597
- fixed : user shouldn't be able to toggle running, reset or save an open script that's inside of a locked attachment
...
--HG--
branch : RLVa
2010-09-28 12:37:18 +02:00
753238d70e
VWR-21377 Script editor ctrl-f fix.
...
make ctrl-f work from the script search box itself.
2010-09-24 16:54:28 -07:00
e6e551cb41
Merged with default tip (Revision 7a739cbdce56)
...
--HG--
branch : RLVa
2010-08-28 02:06:00 +02:00
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
b6a073c659
Initial commit of RLVa-1.2.0i
...
--HG--
branch : RLVa
2010-08-22 10:57:22 +02:00
02d8197019
changed buildPanel/buildFloater to member functions buildFromFile
...
streamlined LLUICtrlFactory's interface
2010-08-20 10:14:28 -07:00
124bc854dd
moved buildFloater out of lluictrlfactory to llfloater.cpp
2010-08-16 17:44:23 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
566e3969f9
deprecated LLPanel::child*() methods
2010-07-30 10:02:30 -07:00
f096f02278
EXT-6728 : Have LLInventoryFetchItems/DescendentsObserver inherit from a base abstract LLInventoryFetchObserver class
...
Added a new abstract class LLInventoryFetchObserver from which LLInventoryFetchItems and LLInventoryFetchDescendents inherit.
Also changed isEverythingComplete to isFinished and made some other minor superficial changes.
2010-04-06 18:58:26 -04:00
2eba9819df
EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines
...
Took out enums and flags from LLInventory into LLInventoryDefines
Did a bunch of header file reformatting for LLInventory.h
Change made to simulator files as well.
2010-04-05 15:02:36 -04:00
b1b5a11bb0
EXT-3075 : Remove swear words from comments across viewer
...
This bugs me in a minor way. Did a search-and-cleanup on various swear words.
2010-03-29 15:33:48 -04:00
fecaf7b64f
CID-135 followup
2010-02-15 17:35:45 +00:00
5f08031bbd
CID-135
...
Checker: NULL_RETURNS
Function: LLPreviewLSL::postBuild()
File: /indra/newview/llpreviewscript.cpp
2010-02-15 17:35:24 +00:00
ca1e4d99a2
CID-81
...
Checker: FORWARD_NULL
Function: LLScriptEdCore::onBtnDynamicHelp()
File: /indra/newview/llpreviewscript.cpp
2010-02-11 13:00:18 +00:00
Nicky