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

65 Commits (092a09074795b4dcaec3c37febef7b43bae7c461)

Author SHA1 Message Date
Ansariel c6eeeeaf43 Merge viewer-bear 2016-02-04 22:41:31 +01: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
Ansariel 68739bc569 Merge Viewer-Bear 2015-10-27 01:31:15 +01: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
Ansariel 4dc6285816 Merge LL V3.7.15 2015-01-14 13:06:49 +01: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
Ansariel 964f5d517c FIRE-13085: Firestorm specific fix for unintentional trigraphs; by Cron Stardust 2014-03-13 08:37:55 +01: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
Tank_Master 14001c54df Gastly CHUI merge pass 1, don't count on anything to work. 2013-06-26 12:14:54 -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
Tank_Master 9f4245779c Partial Merge of LL 3.4.2 Release 2012-12-10 15:56: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
Ansariel 2383af97c1 Don't be able to estate kick yourself from top scripts (FIRE-6514) 2012-06-06 16:56:34 +02:00
Ansariel 2b59f181bb Fixed profile and estate kick button in top objects not working if display names are disabled 2012-04-22 22:35:52 +02:00
Ansariel e664307983 Removed unnecessary include that sneaked into llfloatertopobjects.cpp 2012-04-13 11:22:15 +02:00
Ansariel b0e9858b4e Added script info button to top objects floater (FIRE-2206) 2012-04-07 12:48:37 +02:00
Ansariel 9a134d8c25 Added profile and estate kick function to top scripts floater 2012-04-06 23:42:17 +02:00
Ansariel 52eff5af06 Added "Teleport to" button on region top objects floater; Changed button type for refresh button to text (FIRE-2259) 2012-01-17 15:24:33 +01: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