summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-12-22STORM-744 : pull from STORM-151Merov Linden
2010-12-22STORM-805 : add some printout to the log so we can trace the answer ↵Merov Linden
map-server-url at startup
2010-12-22Merge with tip of viewer-developmentcallum
2010-12-22STORM-808 : merge webkit upgrade to Qt v4.7.1Merov Linden
2010-12-22STORM-806 FIXED Enabled external editor for inventory scripts.Vadim ProductEngine
Changes: * Moved external editor handling to LLScriptEdCore which is shared between LLLiveLSLEditor (object script editor) and LLPreviewLSL (inventory script editor). * The Edit button is now only enabled when appropriate.
2010-12-22Setting viewer version numbers back to what they were as per Merov's review ↵Andrew Meadows
request.
2010-12-22mergeAndrew Meadows
2010-12-22removing some very old debug spamAndrew Meadows
2010-12-22mergeAndrew Meadows
2010-12-22STORM-466 Fix for: minimap cannot be reset to default zoomJonathan Yap
2010-12-21SOCIAL-374 FIX Avatar images not loading on join.secondlife.com in Webkit 4.7Monroe Linden
Reviewed by Callum
2010-12-21STORM-151 : pull in viewer-developmentMerov Linden
2010-12-21STORM-460 : pull in viewer-developmentMerov Linden
2010-12-21STORM-524 : pull in viewer-developmentMerov Linden
2010-12-21STORM-453 : pull in viewer-developmentMerov Linden
2010-12-21Merge from trunkAndrew A. de Laix
2010-12-20STORM-151 : Fix llui_libtest integration testMerov Linden
2010-12-20SOCIAL-399 FIX Viewer crash when canceling http auth on a media primMonroe Linden
Reviewed by Callum at http://codereview.lindenlab.com/5636001
2010-12-20STORM-805 : Fix the map URLMerov Linden
2010-12-20Fix for a couple of minor merge issues.Monroe Linden
2010-12-20Remove unimplemented software updater option. Fix potential double start of ↵Andrew A. de Laix
updater service.
2010-12-20Merge from viewer-development.Monroe Linden
2010-12-20fix windows build?Andrew A. de Laix
2010-12-20Merge - final pull of viewer-development.Monty Brandenberg
2010-12-20STORM-387 FIXED Part of the table is hided after increasing firsts column ↵Paul Guslisty
width in the floater and then dock it to the SP - Replaced absolute width of columns with relative
2010-12-20Fixing windows build error about inequality comparison between S32 and U32.Andrew Meadows
2010-12-20STORM-411 FIXED The most of additional options in the Teleport History ↵Paul Guslisty
profile are always disabled - Deleted unimplemented menu items from XML - Hide "Make a Landmark" menu item in case "Teleport History Place Profile" panel is opened
2010-12-20merge fix for storm-412Oz Linden
2010-12-20merge fix for storm-801Oz Linden
2010-12-20merge fix for storm-796Oz Linden
2010-12-18STORM-467 Fix for minimap zoom does not persist to the next sessionJonathan Yap
2010-12-18STORM-511 FIXED Display tooltip for sender name on group notices.Vadim ProductEngine
Changes: * Set tooltip for sender name. * Overridden handleTooltip() for the tooltip to be of normal (yellow) color.
2010-12-18Merge STORM-796Vadim ProductEngine
2010-12-18STORM-796 ADDITIONAL_FIX Fixed Mac build.Vadim ProductEngine
2010-12-18STORM-412 FIXED Resident profile controls aren't reshaped on changing panel ↵Paul Guslisty
width - Added parameters for text boxes to follow right side of panel
2010-12-18STORM-460 FIXED "Go" button is cropped from right in the Media BrowserPaul Guslisty
- Decreased button width
2010-12-18STORM-801 FIXED Wrong checkbox label in panel preferences, advanced tabPaul Guslisty
- Corrected checkbox label
2010-12-17STORM-744 : Add llkdu unit tests, turn on and fix llworldmap unit tests in ↵Merov Linden
newview
2010-12-17For object-vs-parcel overlap we now use list of axis aligned boxesAndrew Meadows
one box for each prim, for less slop on queries
2010-12-17SOCIAL-395 (FIX) LLWebContentFloater not handling Javascript size and window ↵callum
position parameters in Change to llfloaterwebcontent.cpp is a whitespace change only to fix a broken checkin
2010-12-17Better fix for CHOP-286 - reenabled bandwidth limits on linux now that we've ↵brad kittenbrink
fixed the freeze.
2010-12-17SOCIAL-371 (PARTIAL) HTTP Auth sites do not load / allow login on Media on a ↵callum
Prim faces in Webkit 4.7 Fixes broken text substituition of realm/host only.
2010-12-17Temporary workaround for CHOP-286: bandwidth limits freeze the downloader ↵brad kittenbrink
thread on linux
2010-12-17Adding newline char at EOF so linux version builds (sigh)callum
2010-12-17Merge from viewer-development post 2.4 releaseMonty Brandenberg
2010-12-17STORM-477 WIP Re-implemented LLDir::getNextFileInDir() as an iterator object.Seth ProductEngine
- Added a class implementing directory entries iteration with pattern matching which is used in unit tests instead of LLDir::getNextFileInDir. STORM-550 FIXED Fixed LLDir unit test which failed for some complex wildcard combinations.
2010-12-17Automated merge with https://bitbucket.org/mani_linden/viewer-developmentAndrew A. de Laix
2010-12-17ich bin stupid; this should actually fix the windows build.Andrew A. de Laix
2010-12-17don't rely on stream cast to bool behavior; use explicit fail call.Andrew A. de Laix
2010-12-17STORM-744 : Turn llimage/tests/ on againMerov Linden