andreykproductengine
ffc6418794
SL-10545 Provide summary memory information in Top Scripts
2019-02-14 16:37:11 +02:00
maxim_productengine
3527e9c042
SL-3488 Remove "Disable Selected" and "Disable All" Buttons
2019-01-18 16:12:49 +02:00
andreykproductengine
bbb516c5ae
MAINT-8291 Fixed Scripts memory usage returns incorrect values in estate tools
2018-02-15 15:47:31 +02:00
Oz Linden
950c41d184
merge 4.0.4-release and MAINT-5974
2016-05-06 10:28:42 -04:00
Mnikolenko ProductEngine
a849d82520
MAINT-5667 FIXED When attempting to check the top scripts, the parcel names would not load in the top scripts console.
2016-02-02 12:21:01 +02:00
Oz Linden
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
Oz Linden
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
Mnikolenko ProductEngine
d175048537
MAINT-1390 FIXED Top colliders floater reopens itself if it was closed at once after opening
2015-10-05 12:36:47 +03:00
Oz Linden
7ede86c97a
merge changes for STORM-2031
2014-08-06 16:18:45 -04:00
Jonathan Yap
4fffc8c8e4
STORM-2031 Display issues with Top colliders/Top scripts floater
...
OPEN-217 Change to media_plugin_quicktime.cpp causes Windows compile to fail
2014-05-13 12:30:29 -04:00
Jonathan Yap
ce27987c87
STORM-2030 Rapidly clicking the refresh button in selected floaters may result in duplicate entries
2014-05-12 16:25:48 -04:00
Graham Madarasz
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
Merov Linden
3a49beed0e
CHUI-580 : WIP : Change the display name cache system, deprecating the old protocol and using the cap (People API) whenever available. Still has occurence of Resident as last name to clean up.
2012-12-05 20:25:46 -08:00
simon@Simon-PC.lindenlab.com
1ca7d3a57e
MAINT-1173 : Top Scripts: Break down usage by parcel. Follow-on code to add
...
per-parcel filtering. Reviewed by Kelly
2012-06-27 13:58:37 -07:00
simon@Simon-PC.lindenlab.com
c52a8783c5
MAINT-1173 : Top Scripts: Break down usage by parcel. Reviewed by Kelly
2012-06-25 18:34:09 -07:00
Joshua Bell
6bee953220
STORM-1130: Top Scripts: Date/time sorting is broken (sorts lexically)
...
Use LLScrollListCtrl's intrinsic support for date-typed columns.
2011-04-01 09:24:41 -07:00
Kelly Washington
a9ac07acf2
ER-320 Fix public urls in top scripts.
2011-03-22 10:14:45 -07:00
Leyla Farazha
a4b223248e
Merge
2010-09-27 17:54:52 -07:00
Aimee Linden
ffae589843
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03 17:41:39 +01:00
Aimee Linden
0a74d15935
Merge between james/viewer-identity-evolution and dessie/viewer-public
2010-09-03 15:30:16 +01:00
Monroe Linden
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07:00
Tofu Linden
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
Tofu Linden
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
Tofu Linden
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
Richard Nelson
124bc854dd
moved buildFloater out of lluictrlfactory to llfloater.cpp
2010-08-16 17:44:23 -07:00
Oz Linden
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
Richard Nelson
566e3969f9
deprecated LLPanel::child*() methods
2010-07-30 10:02:30 -07:00
James Cook
00e8b3548c
DEV-50013 Region debug top scripts/colliders display names
2010-05-27 18:08:49 -07:00
James Cook
2b7153c26a
merge from dessie/viewer-public right before SLE code landed
2010-05-11 16:11:09 -07:00
Loren Shih
114e5ca083
EXT-5940 : Typedef all vector<LLUUID>'s
...
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-29 16:33:35 -04:00
James Cook
fe8d015851
Merge
2010-03-02 14:06:23 -08:00
James Cook
b187f7bc15
DEV-46407 Region Debug Tab Top Scripts table contains SLID with Resident
...
Fixed for Top Colliders too
2010-02-23 17:01:34 -08:00
Tofu Linden
51e2ee7b3a
CID-145
...
Checker: NULL_RETURNS
File: /indra/llui/llscrolllistctrl.cpp
2010-02-13 13:45:28 +00:00
gabriel
e148eebff3
Added a first view script limits floater
...
reviewed by Mani
2009-12-19 01:57:42 +00:00
James Cook
cbc0783cd1
Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
...
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -08:00
James Cook
458430be91
Removed include llnotifications.h from llfloater.h trying to speed builds
...
Fixed many other includes related to this file.
Cleaned out llfloatertestlistview to be an empty test floater.
2009-11-24 22:13:10 -08:00
James Cook
52aeaa3284
Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
...
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
2009-07-07 00:53:05 +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
Kelly Washington
aa2b978bf5
merge -r 112783:112799 linden/branches/kelly/lsl-http-in-merge to linden/trunk
2009-02-24 19:29:36 +00:00
Adam Moss
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
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
Mark Palange
fb793870fe
QAR-1142 merging 1.22 RC0-RC4 changes.
...
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
2008-12-23 19:39:58 +00:00
Mark Palange
f89f19990c
QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
2008-11-07 17:51:03 +00:00
Steven Bennetts
da94c0eaa2
QAR-855 Viewer 1.21 RC 2
...
merge viewer_1-21 94770-96059 -> release
2008-09-12 06:27:13 +00:00
Steven Bennetts
4a6bacea0f
merge viewer/viewer_1-21 94170-94770 -> release
...
merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
2008-08-28 23:57:41 +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
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
James Cook
ed386ae547
merge support-featurettes-snapshot-merge-2 for QAR-754, includes:
...
* featurettes-4 89061:89589 (which is all of featurettes-1, -2, and -3, and part of -4)
* gteam-showstoppers-3 91950:91951 (which is all of gteam-showstoppers-1, -2, and -3)
* featurettes-5 92149:92150 (patch for last line of chat text not visible in chat history, DEV-17771)
* snapshot-3 91988:91991 (which is all of snapshot-1, -2, and -3)
Merging revisions 92190-92387 of svn+ssh://svn.lindenlab.com/svn/linden/branches/support-featurettes-snapshot-merge-2 into release, respecting ancestry
* QAR-590 Merge Lock Request for Support Sprint
* QAR-627 Merge snapshot improvements
* QAR-686 Merge Lock request for Featurettes
2008-07-18 17:50:25 +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