c92eb7e591
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2016-08-30 11:36:06 -04:00
b25a22a2c1
Merged in lindenlab/viewer-release
2016-05-19 23:02:37 +03:00
eec33adf34
MAINT-3286 FIXED Fix error message on snapshot save when user has no L$
2016-04-13 18:59:00 +03:00
9be58e915a
merge with 4.0.3-release
2016-04-04 15:53:09 -04:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
f2850548ab
Forgot to remove an unused varable and renamed NewFileResourceUploadInfo to LLNewFileResourceUploadInfo
2015-07-20 17:00:06 -07:00
1a6a6c786d
LSL Script upload from inventory.
2015-07-15 14:35:53 -07:00
91f636f23a
MAINT-5356: Conversion of Notecards and Gesture to use new coroutine uploading.
...
Minor reorganization of Upload Info classes.
2015-07-10 16:45:07 -07:00
f00cd0ab9f
Crash on second add to coproc queue.
2015-07-02 14:39:12 -07:00
6a82ff08d9
MAINT-5232: Normalize LLGlobalEconomy's use of LLSingleton.
...
LLSingleton currently presents two different usage styles: deriving MyClass
from LLSingleton<MyClass>, or just using a typedef. Turns out LLGlobalEconomy
is the ONLY class using the typedef style -- and the apologetic comment talks
about a potential maintenance that hasn't actually happened.
Derive LLGlobalEconomy from LLSingleton<LLGlobalEconomy>, like everyone else.
2015-05-28 16:52:09 -04:00
51ed4c977a
Update to build on Xcode 6.0: remove lots of unused variables
2014-10-18 12:14:33 -07:00
0031e9a97b
merge up to 3.6.10-release; some of the storm-68 changes lost
2013-11-19 17:59:55 -05:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
b6df9b6d56
STORM-68 Fiddling with debugging for New Script case
2012-06-09 11:43:39 -04:00
d61a5f743c
STORM-68 Removed debugging PERM_ALL that was causing upload trouble and removed 3 obsolete debug settings
2012-06-09 10:05:54 -04:00
fbb4e5fb0f
STORM-68 As a Builder, I want that ability to set default permissions on creation of objects, clothing, scripts, notecards, etc.
...
First pass at implementation, debuggins lines still need to be removed and there is one known bug to be resolved.
2012-06-08 13:49:02 -04:00
619f737abb
STORM-1803 Adding raw anim file upload support
2012-01-29 15:34:51 -05:00
c1745ca4aa
Fixes .lsl not being appended if no extension is provided.
2011-11-18 21:55:40 +00:00
b28492fbff
STORM-1708 Adding ability to save/load scripts from file.
2011-11-17 23:17:26 +00: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
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
f4b7164752
Backed out changeset 1c66b34b7fbe
2010-06-15 14:48:14 +01:00
7480e06934
Hooked up Save As Profile Pic
...
reviewed by Richard CC# 167
2010-03-24 16:39:59 -07:00
ddfc6efbee
EXT-5025 - Tooltips block mouse clicks
...
EXT-4547 [BSI] it is possible to highlight multiple layers of chat
EXT-3844 Mouse wheel camera zoom is not reflected on View popup slider
EXT-3103 Add an option to restrict entering non-ascii symbols in text editor.
reviewed by Leyla
2010-02-05 11:32:33 -08:00
15cbc0abd8
EXT-2403 Object name, description now forced to be ASCII characters only
...
Also fixes EXT-172, EXT-2399. Semantics now are:
Object name, object desc, parcel name, region name, inventory item name
all are ASCII only.
Parcel desc allows arbitrary Unicode chars.
Group names force ASCII only.
Reviewed with Leyla
2009-11-17 16:07:48 -08:00
b806edf4ac
Redo Bao's broken merge
2009-11-04 14:59:23 -08:00
eb853f55c0
svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-08-04 01:12:59 +00:00
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
e188badaf2
QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
...
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314
Whew.
2009-02-03 17:56:26 +00:00
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
e1d8dac25a
svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge
...
Resolving QAR-1051 Merge featurettes batch #4
2008-12-15 21:21:19 +00:00
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
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
941cb9f412
merge release@83343 skinning-1-merge@83714 -> release
...
QAR-424
2008-04-01 17:45:04 +00:00
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
f8511d77a7
EFFECTIVE MERGE: maint-ui-qa3 -r 73391:74133 -> release
...
ACTUAL MERGE: merge release@74893 maint-ui-3-merge@74902 -> release
2007-12-04 16:46:00 +00:00
f41b7bb8df
-74901 (back out premature commit to release)
2007-12-03 19:44:04 +00:00
d5eef2d8a6
merge -r 73391:74133 maint-ui-3 -> release
2007-12-03 19:36:44 +00:00
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
7138fb673a
Merge down from Branch_1-18-1:
...
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
2007-08-02 01:18:34 +00:00
1c909afe39
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
2007-05-02 21:24:47 +00:00
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
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Nat Goodspeed