summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-12-14merge fix for storm-713Oz Linden
2010-12-14merge fix for storm-401Oz Linden
2010-12-14merge fix for storm-229Oz Linden
2010-12-14merge fix for storm-434Oz Linden
2010-12-14Merge CHOP-267 fixes with latest viewer-beta.brad kittenbrink
2010-12-14merge fix(es) for storm-378Oz Linden
2010-12-14STORM-352 FIXED Vertical scrollbar isn't reshaped in resident profile panel ↵Paul Guslisty
after decreasing panel height - Set height of scroll container the same as bounding panel's height
2010-12-14STORM-434 FIXED Tooltips don't appear on Mini-Location bar.Paul Guslisty
- Added localized tooltips for icons and info button in LLPanelTopInfoBar
2010-12-14STORM-713 FIXED XML/UI issues in llTextBoxPaul Guslisty
- As the class LLToastNotifyPanel is deprecated, made the class LLToastScriptTextbox derived directly from LLToastPanel. - Added callback for ignore button. Now LLToastScriptTextbox has its own XML, therefore it's not needed to dynamically create toast panel. Since LLToastNotifyPanel is deprecated all new notification toasts should be created this way.
2010-12-13automated mergeRoxie Linden
2010-12-13Re-add convex hull for simple prims and sculpties,Roxie Linden
as per Falcon's advice
2010-12-13fixed bad line endingsBrad Payne (Vir Linden)
2010-12-13mergeBrad Payne (Vir Linden)
2010-12-13STORM-766 : pull into viewer-developmentMerov Linden
2010-12-13STORM-693 : pull into viewer-developmentMerov Linden
2010-12-13STORM-636 : pull into viewer-developmentMerov Linden
2010-12-13STORM-622 : pull into viewer-developmentMerov Linden
2010-12-13STORM-431 : pull into viewer-developmentMerov Linden
2010-12-13STORM-391 : pull into viewer-developmentMerov Linden
2010-12-13Commented out some unused variables that gcc complains aboutprep linden
2010-12-13SH-646 FIXBrad Payne (Vir Linden)
2010-12-13SH-653 FIX: upload button now starts out disabledBrad Payne (Vir Linden)
2010-12-13SH-582 Order of the preview menu items in the same order as theLODs appear ↵Loren Shih
in the Import Model window Reordered from highest to lowest.
2010-12-13STORM-401 FIXED Add recepients of teleport offers to the recent people list.Vadim ProductEngine
2010-12-13Cleanup a cross-thread command dtor. It was technicallyMonty Brandenberg
correct but looked a bit dodgy with pointer ownership.
2010-12-13Automated merge up from viewer-developmentLoren Shih
2010-12-13STORM-781 FIXED Added support for editing multiple scripts within inventory ↵Vadim ProductEngine
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-13STORM-229 FIXED Fixed long loading times and stalling of Viewer while ↵Andrew Productengine
loading big scripts or pasting a lot of text into script. The bug was fixed by Satomi Ahn. Here is the description of what causes the problem from her comment in ticket: "Disabling the loading of syntax keywords in LLScriptEdCore::postBuild() removes the freeze (and with it: syntax highlighting). So it obviously comes from the parsing of the text. I also noticed something else: by adding a llwarn in LLTextEditor::updateSegments(), I saw that this function was called a lot of times when loading a script, roughly once for each line in the script (naively I would have thought only necessary to update when finished... or to only update the new line). My llwarn was in the "if (mReflowIndex < S32_MAX && mKeywords.isLoaded())", which means that, at each call, the text is actually parsed for all keywords... so the parsing of the script becomes quadratic instead of linear!!!" - To fix this, Satomi added a flag depending on which parsing is disabled when it is not necessary.
2010-12-11Update unit tests to reflect the new array-of-regions style ofMonty Brandenberg
LLSD serialization for viewer metrics.
2010-12-11ESC-211 ESC-212 Use arrays in payload to grid and compact payloadMonty Brandenberg
First, introduced a compact payload format that allows blocks of metrics to be dropped from the viewer->collector payload compressing 1200 bytes of LLSD into about 300, give-or-take. Then converted to using LLSD arrays in the payload to enumerate the regions encountered. This simplifies much data handling from the viewer all the way into the final formatter of the metrics on the grid.
2010-12-11STORM-766 ADDITIONAL FIX Made day cycle image in the advanced sky editor ↵Vadim ProductEngine
honor floater opacity settings.
2010-12-11STORM-391 FIXED Dismiss toasts that don't fit on screen.Vadim ProductEngine
Make sure older toasts don't appear after newer ones fade out.
2010-12-11STORM-391 WIP Removed unused methods.Vadim ProductEngine
2010-12-10mergeDave Parks
2010-12-10Remove redundant call to glodGroupParameteriDave Parks
2010-12-10More correct GLOD usage -- one group, many objects.Dave Parks
2010-12-10Decided to refactor a bit. Was using LLSD as an internal dataMonty Brandenberg
representation transferring ownership, doing data aggregation in a very pedantic way. That's just adding unneeded cost and complication. Used the same objects to transport data as are collecting it and everything got simpler, faster, easier to read with fewer gotchas. Bit myself *again* doing the min/max/mean merges but the unittests where there to pick me up again. Added a per-region FPS metric while I was at it. This is much asked for and there was a convenient place to sample the value.
2010-12-10Defensive coding for linux updater script for consistency with alain's work ↵brad kittenbrink
on the mac script. Should be safer if the user is installing to a path with spaces in it.
2010-12-10fixed model uploader aspect not updating, text not following resize, and ↵leyla_linden
file name not filling in
2010-12-10fix quoting in script to work with spaces in directory names.Andrew A. de Laix
2010-12-10fix working directory in install script and remove dependency on open option ↵Andrew A. de Laix
--args which is 10.6 only. Also fix erroneous check in process launcher which was mistakenly reporting a failed execution of the new updater script.
2010-12-10merge cleanup.Dave Parks
2010-12-10mergeDave Parks
2010-12-10Merge from viewer-developmentMonroe Linden
2010-12-10Add xml for model importer gears menu.Dave Parks
2010-12-10Reskin model importer according to latest spec, add extra LoD decimation ↵Dave Parks
parameters.
2010-12-10Remove "HACK upload model" menu option.Dave Parks
2010-12-10DoF tweaks cleanup.Dave Parks
2010-12-10DoF tweaks -- reviewed by Falcon.Dave Parks
2010-12-10ESC-228 ESC-227 Corrections for metrics counters and send-on-quit delivery.Monty Brandenberg
Wanted to avoid computing metrics for duplicate requests as much as possible, they artificially depress averages but missed an opportunity and was including them in the counts. The non-texture case is solid. Textures are.... confounding still. Do a better job of trying to send one last packet to the grid when quitting. It is succeeding now, at least sometimes. Put a comment in base llassetstorage.cpp pointing to cut-n-paste derivation in llviewerassetstorage.cpp so that changes can be replicated. Hate doing this but current design forces it.