Commit Graph

206 Commits (95e44923920fbd57eaeec50ae696aee80405b457)

Author SHA1 Message Date
Richard Linden 8de397b19e SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
changed LLCriticalDamp to LLSmoothInterpolation and sped up interpolator lookup
improvements to stats display of llstatbar
added scene load stats floater accessed with ctrl|shift|2
2013-03-18 08:43:03 -07:00
Graham Madarasz (Graham Linden) e8dfa28697 Rollback Maestro interp changes 2013-03-14 14:12:26 -07:00
Graham Madarasz (Graham) f061b2b90e Optimize interp code to elim hundreds of divides per frame and fix jitter bugs. 2013-03-08 15:31:37 -08:00
Don Kjer 54cdc322b8 Fixing issues with not detecting when LLSD XML parsing fails. Changing most http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam. 2013-03-05 22:05:22 -08:00
Dave Parks 609ed855e1 MAINT-2371 More optimizations.
Reviewed by Graham
2013-03-04 18:01:42 -06:00
Richard Linden a6bb68b6e5 SH-3275 FIX interesting Update viewer metrics system to be more flexible
fix for inaccurate optimization of full block time calculations
2013-02-13 15:21:20 -08:00
Richard Linden 438cbfe489 SH-3275 WIP interesting Update viewer metrics system to be more flexible
fix for timings for recursive fast timers not being correct
2013-02-07 20:07:31 -08:00
Richard Linden b49cdb1c7a SH-3275 WIP interesting Update viewer metrics system to be more flexible
quantized fast timer range to nearest 20ms for easier reading
2013-02-05 11:31:45 -08:00
Richard Linden eb6c8959ca SH-3275 WIP interesting Update viewer metrics system to be more flexible
fixed most fast timer display and interaction issues
2013-02-02 01:09:52 -08:00
Richard Linden a441664c10 SH-3275 WIP interesting Update viewer metrics system to be more flexible
fast timer bars render correctly
2013-01-31 00:50:54 -08:00
Richard Linden 2c68d5367c SH-3275 WIP interesting Update viewer metrics system to be more flexible
fixed memory leak
fixed glitching of fast timer display
2013-01-27 21:35:20 -08:00
Richard Linden 3a555a2ff8 SH-3275 WIP interesting Update viewer metrics system to be more flexible
removed LLFastTimerView::getFrameTimer()
dead code elimination
fixed off by one array access crash
2013-01-24 19:53:17 -08:00
Nyx Linden 11fe124ae9 merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
Richard Linden 096b2738c2 SH-3275 WIP interesting Update viewer metrics system to be more flexible
clean up LLFastTimerView so it can be converted to handling LLTrace data
2013-01-24 01:18:49 -08:00
Richard Linden 44cc14fbee fix for mac builds 2013-01-11 13:11:07 -08:00
Andrew Meadows 27bec2b2f2 yet more gcc fixes 2013-01-10 05:06:11 +00:00
Andrew Meadows 90b5937c74 gcc fixes 2013-01-10 04:19:16 +00:00
Richard Linden 013f04cabe SH-3468 WIP add memory tracking base class
improvements on lifetime of lltrace core data structures
tweaks to thread local pointer handling so that static constructors/destructors
can safely call functions that use lltrace
2012-12-21 00:13:21 -08:00
Richard Linden c219282f5d SH-3406 WIP convert fast timers to lltrace system
removed some potential data races
got memory stats recording in trace system
2012-12-18 20:07:25 -08:00
Richard Linden 8c2e3bea71 SH-3406 WIP convert fast timers to lltrace system
added ability to query self time of block timers indepedently
2012-12-09 23:19:11 -08:00
Richard Linden c99886d943 SH-3406 WIP convert fast timers to lltrace system
improved unit tests for LLUnit
renamed LLUnit to LLUnitImplicit with LLUnit being reserved for
explicit units
2012-12-07 15:20:12 -08:00
Richard Linden 60800dacdd SH-3406 WIP convert fast timers to lltrace system
fixed gcc compile error
made LLCopyOnWritePointer contain an LLPointer, not derive from it
added type trait to control periodicrecording mean value type
2012-12-06 00:37:15 -08:00
Richard Linden 6c7825107f SH-3406 WIP convert fast timers to lltrace system
added copy constructor to periodic recording to allow snapshot generation
in fast timer view
fixed build errors
2012-12-04 19:10:02 -08:00
Richard Linden 407e5013f3 SH-3406 WIP convert fast timers to lltrace system
converted fast timer view over to new lltrace mechanisms
2012-12-03 19:54:53 -08:00
Richard Linden 13e4edf1cd SH-3406 WIP convert fast timers to lltrace system
started moving fast timer historical stats over to LLTrace periodic
recording
2012-12-02 23:00:36 -08:00
Richard Linden c136b43214 SH-3406 WIP convert fast timers to lltrace system
eliminated min and max macros from windows.h
got rest of viewer to compile against llfasttimer changes
2012-11-15 19:46:09 -08:00
Richard Linden 9d77e030d9 SH-3406 WIP convert fast timers to lltrace system
cleaning up build
moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc
streamlined Time class and consolidated functionality in BlockTimer class
llfasttimer is no longer included via llstring.h, so had to add it manually in several places
2012-11-14 23:52:27 -08:00
Richard Linden a3e3e8b4cc SH-3406 WIP convert fast timers to lltrace system
simplified llfasttimer code down to 2 classes
llunit unit conversion now done in floating point or 64 bit integer precision,
depending on source type
2012-11-12 19:08:14 -08:00
Richard Linden 819adb5eb4 SH-3405 FIX convert existing stats to lltrace system
final removal of remaining LLStat code
2012-11-01 00:26:44 -07:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Richard Linden afc2807302 MAINT-1486 FIX Crash on login (Unhandled exception)
cleaner implementation of llfasttimers...don't bother to share similarly named timers
just create multiple timers with same name...doesn't break anything
2012-08-30 18:35:29 -07:00
Richard Linden a98c7e150b llfasttimer cleanup
removed unnecessary cache miss from fast timers
renamed llfasttimer_class back to llfasttimer
2012-08-06 16:08:04 -07:00
Richard Linden 5564fcb271 SH-3275 WIP Run viewer metrics for object update messages
clean up of llstats stuff
2012-07-16 19:15:46 -07:00
Richard Linden c47c31fdbf EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat 2012-01-31 17:51:43 -08:00
Richard Linden 9cb157dde0 EXP-1654 FIX fast timers does not show entire frame when Full bar = Max 2011-12-02 11:02:26 -08:00
Dave Parks bd02cdc75f merge 2011-09-26 19:27:10 -05:00
Dave Parks 7c95af74f1 SH-2243 work in progress -- application side matrix stack management 2011-09-14 16:30:45 -05:00
Richard Nelson 8b7c07651c improved fast timers display
can move and resize
better visualization of timer history
can click drag to browse history
increased frame history to 300
2011-09-14 10:50:32 -07:00
Richard Linden 34b4b3d139 fix for tooltips on fast timer debug view not always updating 2011-08-16 16:13:59 -07:00
Dave Parks 764412f9b5 merge 2011-04-22 11:50:19 -05:00
Merov Linden cb0dcc204d STORM-987 : Add --logmetrics and --analyzeperformance arguments, moved analyzeMetricPerformanceLog() and doAnalysisMetrics() from LLFastTimerView to LLMetricPerformanceTesterBasic 2011-03-08 23:44:00 -08:00
Dave Parks f90eb750f1 SH-1292 Remove outliers from graphs in scene console to make a more useful view. 2011-04-07 00:29:02 -05:00
Loren Shih 690105630e Automated merge up from viewer-development into mesh-development 2011-03-28 10:26:00 -04:00
Loren Shih bfd8efb057 Automated merge up from viewer-development 2010-12-01 10:55:24 -05:00
Brad Payne (Vir Linden) 853e90ea80 removed unused variable 2010-11-08 10:37:58 -05:00
Merov Linden 85509457c6 STORM-105 : Take Vadim code review into account, code clean up 2010-11-05 18:40:08 -07:00
Nyx Linden 3d41e67d7b BUILDFIX: commented out unused variable which breaks the mac build. 2010-11-05 18:51:43 -04:00
Brad Payne (Vir Linden) ddff1c68f2 additional analysis for --analyzeperformance option 2010-11-05 16:17:24 -04:00
Merov Linden 40979589af STORM-105 : improve decompression perf gathering, allow perf name to be passed on the command line, fix crash in analysis phase 2010-10-27 23:15:22 -07:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Merov Linden e3ecffc180 Pull update from viewer-development 2010-10-12 16:08:31 -07:00
Dave Parks 7c2b9221d6 merge 2010-09-27 15:20:27 -05:00
Brad Payne (Vir Linden) 90e3d83a5c Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
Merov Linden 39e5d2ecf0 VWR-22761 : Rearchitecture of llmetricperformancetester and simple (non complete) implementation in llimagej2c 2010-09-08 23:03:56 -07:00
Nyx (Neal Orman) 3bbe5b6d96 CTS-237 WIP test performance to validate new ARC algorithm
minor cleanup and fixing the linux build.
2010-09-03 11:31:08 -04:00
Monroe Linden b62b10dd26 Post-convert merge by convert_monolith.py from ./viewer-experience 2010-08-27 16:58:33 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Richard Nelson a11a8c4027 double click to expand all timers in LLFastTimerView 2010-08-06 15:49:38 -07:00
Richard Nelson 71a45d8f9d fixes for right click fast timer export 2010-08-06 14:44:26 -07:00
Dave Parks bc85982431 Generate graphs of performance logs when -analyzeperformance specified on command line. 2010-07-01 13:14:11 -05:00
Ychebotarev ProductEngine 0a16e7627e cleanup
--HG--
branch : product-engine
2010-03-03 12:40:18 +02:00
Ychebotarev ProductEngine cdb0911a78 fix for EXT-4469 Fast Timers: Minimize and Close icons do not work
--HG--
branch : product-engine
2010-03-03 11:39:45 +02:00
James Cook 9ffaacc47e First pass expose inventory item settings in XML (folder_view_item.xml)
Optimized LLFolderViewItem constructor by passing param block as
const ref to avoid copies.
Removed per-item arrow and background images, use defaults.
Removed unneeded static image pointers.
Removed hard-coded rounded_square.tga, replaced with Rounded_Square
Ditto for folder_arrow.tga
Reviewed with Richard.
2010-01-08 17:26:47 -08:00
richard 02262a60ad EXT-3876 - Fast Timers crashes viewer
avoid divide by zero

reviewed by Mani
2010-01-04 13:05:25 -08:00
richard 4a460a1dcf added optional timing of fast timers themselves 2009-12-21 16:05:20 -08:00
James Cook bc4b49735c merge 2009-11-10 14:36:25 -08:00
James Cook 0f6242d9fd Sanitize naming of getWindowRect (scaled vs. raw pixels) and getWorldViewRect (scaled vs. raw)
Reduces chance of future UI bugs related to UI size.
Discussed with Richard.
2009-11-10 14:00:38 -08:00
richard 4eb72a12a2 data driven layout of top-level UI elements
EXT-1219 Side tray slide-out animation
cleaned up some layout of bottom tray contents

reviewed by James
2009-11-09 15:29:47 -08:00
Mark Palange (Mani) 3e10fa4d51 merge from latest svn/viewer-2-0 to hg/viewer-2-0 2009-10-16 16:42:45 -07:00
Richard Nelson 0e273552ed changed clipping on fast timer view to show x axis labels 2009-10-14 00:21:05 +00:00
brad kittenbrink 50247533f9 Merged latest viewer/login-api with latest viewer/viewer-20 2009-10-07 17:51:28 -07:00
James Cook ada0f4fa22 Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml

Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-10-03 23:40:28 +00:00
brad kittenbrink bb1d4592bd Merged latest viewer/viewer-20 into login-api. 2009-09-18 15:22:25 -04:00
Richard Nelson 58bce2d205 merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1 2009-09-09 01:26:44 +00:00
brad kittenbrink d020dae7b9 Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 merge (r131929).
Some minor post-merge cleanups still required.
2009-08-27 16:25:02 -04:00
Richard Nelson 138bf11322 merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684

improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-24 20:04:52 +00:00
Palmer b2632c50ef Merge of my DEV-36732 work and all the main line login api work that went on. 2009-08-06 14:51:11 -07:00
Palmer 27cf39cdbf DEV-36732
Total time of frame saved

Reviewed by Brad
2009-08-06 14:29:59 -07:00
Richard Nelson 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
Xiaohong Bao 77f56a3f3d merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +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
Christian Goetze 1aa0416aef svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge
Melinda (coco): 5th and final batch of featurettes. My work here is done.
2009-03-13 21:28:40 +00:00
Brad Kittenbrink abdc99f21b Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-02-18 21:10:16 +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
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 25c10ed028 QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
Steven Bennetts ad33281007 QAR-650 - Viewer RC 9 merge -> release (post cmake)
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
Steven Bennetts 63e7894148 QAR-570 maint-render-4 merge
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
2008-05-08 18:41:20 +00:00
Steven Bennetts b5936a4b1d 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
2008-04-03 19:21:14 +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 6fcf38217e merge release@82858 maint-render-2-merge@83010 -> release
QAR-389
2008-03-25 22:50:26 +00:00
Steven Bennetts 377ae59c21 merge Branch_1-19-1-Viewer -r 80930 : 81609 -> release
DEV-11202: Unhandled Excpetion in pipeline.cpp.
Merged over updated windlight ui help text from windlight14.
Reverting a const change in a virtual that was not propagated to all overrides.
DEV-10957 stop and pause Media and music buttons do not work
DEV-10762 Displayed page in the client browser disappears when crossing property boundaries.
DEV-11220 replace misspellings in alerts.xml parameters of 'messsage'
DEV-11221 fix a misspelling of 'participants' in floater_chat_history.xml tooltip
DEV-11193 clean up some viewer strings related to Windlight help text
svn merge -r81144:81147 svn+ssh://svn/svn/linden/branches/1-19-1-viewer-threads
DEV-11110  	 Media browser history dropdown does not save items across sessions
Ran the xuiparse -process tool on all en-us xml files.  This does NOT change any data, merely reorders attributes and cleans up tab/spacing.
DEV-11349 XML CLEANUP: fix duplicate sibling names in en-us xui files
DEV-11348 Change to llmimetypes.cpp broke Media Type dropdown
dev-10623 "parcels that played movies no longer work in combo-merge-ui"
DEV-11379 - crash in LLTabContainer::draw()
DEV-11377 Elminiate dangerous LLLinkedList and LLDoubleLinkedList from newview
DEV-11158 sculpties on the top10 crash list
DEV-11404 "Send Current URL to Parcel" does not set the MIME type
merge 80958:80959 maint-ui-9-qa, DEV-11105 -- Searching for people with 3 characters like "j l" hurts the database.
DEV-10489: no draw distance cheating
DEV-879: water noise frequency
DEV-10764: macbook air support
DEV-10878: Linux Intel945 support
DEV-7551: featuretable adjustments for framerate.
DEV-11426 Enormous mini-map.
DEV-11505 - Crash in gunzip_file.
Removed final LinkedList, SkipMap, and AssocList templates from the Viewer!
DEV-11115  truncated word in the Advanced Water Editor's modal help dialog
2008-03-11 01:47:36 +00:00
Brad Kittenbrink 6d52efe452 Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).

svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2008-02-27 18:58:14 +00:00
Steven Bennetts 903292ba67 merge -r 78989:80279 Branch_1-19-0-Viewer-> release
Changes from 1.19.0.2 and 1.19.0.3

DEV-9226 Some Dazzle? icons have sneaked into the release branch
DEV-9226 - lock icon not appearing in properties window for no-modify inventory items
DEV-8771 Preferences > Web has truncated text in the Address: section, ported and tested minor xml change
DEV-9736 commit 1.19.0 second set of translated xui strings
DEV-9825 Make the region info message a passive notification
DEV-7714 - Korean viewer crashes on startup.
DEV-9759 - Stand up button etc dissapear offscreen after using mouselook
DEV-9938 client-readme-voice.txt missing from open source distribution
DEV-9436 Changed default SL window size to 1000x700, to allow buttons in UI to have proper labels (Communicate) and search to fit onscreen.
DEV-10031    	Clicking on another users classifieds ad then closing asks you to save changes
DEV-10066    	Checking to select a role does not enable the apply button
DEV-8809    	stray 'Done" on the Profile Web tab
DEV-8515 Debug settings overrides do not work for booleans.  svn merge -r77376:77377 sl-parcelmedia-3.  OK by cg.
DEV-10083: Preferences window docks at an offscreen position and cannot be moved vertically
DEV-10186 - LLIMPanel kills the framerate for group ims.
DEV-10108 Viewer freeze and delay in opening map
DEV-10115 Visible flashing of prim highlight when editing
DEV-10112 	Parcel audio play setting is not remembered when crossing over a parcel with no media
DEV-10109 	Alt and left/right arrow keys dont move you between tabs
DEV-10093 	Login Page > SL Release link overlaps Quit when viewer resized
DEV-10048 	Redocking the Contact list causes the communicate ui to get ugly
DEV-8131  	 Deutsch "System Default" is translated as "System Error" in language preferences
DEV-10209 - reverted floater_test.xml to empty floater.
DEV-10255 - Clicking on gestures button moves open windows
DEV-10046 	Pressing escape doesnt cause the chat history or inventory windows to lose focus
DEV-10399 -- Update required version of QuickTime library to 7.4.1 for 1.19.0 Viewer
DEV-10410 - Toggling voice causes layout problems in toolbar
DEV-8562 - Viewer crash just after login
DEV-10147 - "LLXmlTree parse failed" with settings_releasecandidate.xml
DEV-9874 - Land forsale icon in menubar overlaps pushobject restriction icon
DEV-9701 - Upload Animation window: Button missing in Stopped window state
DEV-10355 - Client crashes when viewing the proposals tab in group information
DEV-10521 My Landmarks dropdown list adds a repetition to EOF every time it's opened
DEV-10496 Groups>Proposals>Past Vote text gets chomped
DEV-10499 Defaulted buttons in floater dialogs remain highlighted when not in focus
DEV-5611 - Crash reporter appears in the background on mac (Changed launch to use open instead of direct binary call)
DEV-10704 - Crash reporter not initializing boolean, causing false exec_froze reporting (Added initilizer to constructor)
2008-02-19 23:12:34 +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
Steven Bennetts 050dad0ce3 merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079 2007-11-07 22:55:27 +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
Monroe Williams 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
Don Kjer 1c909afe39 svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-02 21:24:47 +00:00
Josh Bell b36dc36306 svn merge -r 58902:58986 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-03-09 01:09:20 +00:00
Steven Bennetts c4059553af SKIPPED 58849. merge -r 58856:58859 maintenance -> release 2007-03-07 01:16:27 +00:00
Steven Bennetts 7e99d870f2 Commented out temp fast timers that got checked in. 2007-03-03 19:02:17 +00:00
Steven Bennetts 4dabd9c047 merge release@58699 beta-1-14-0@58707 -> release 2007-03-02 21:25:50 +00:00
Steven Bennetts 7f50e28b0f merge -r 56842:57026 maintenance. 2007-01-23 19:12:31 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00