summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-10-25Merge with lindenlab/viewer-developmentKyle Ambroff
2010-10-25Null checks for mOutput for good luck.Kyle Ambroff
2010-10-23ER-219: Add an asynchronous api for the region debug consoleKyle Ambroff
Add support for a new capability, SimConsoleAsync. This is a replacement for the deprecated SimConsole capability that provides an asynchronous API. The old API is still supported, but the simulator will never support both. For the new API, commands will be sent via HTTP POST to the SimConsoleAsync capability, same as before. But the resulting output will be pushed to the viewer view the event-poll, using the newly added SimConsoleResponse LLSD message. Will review with Simon or Falcon.
2010-10-22STORM-423 : merge with viewer-developmentMerov Linden
2010-10-22STORM-406 : merge with viewer-developmentMerov Linden
2010-10-22STORM-322 : merge with viewer-developmentMerov Linden
2010-10-22STORM-297 FIXED Fixed "<nolink>" text appearing in confirmation message if ↵Vadim ProductEngine
there is "<" symbol in Landmarks name. Modified the "<nolink>...</nolink>" clause parsing regexp to allow "<" in the middle.
2010-10-21Merge with andrewKyle Ambroff
2010-10-21SH-325 FIXED Add terminal / to SerachURL in viewer settings.xmlLoren Shih
Trivial fix to add "/" to the search string.
2010-10-21STORM-322 FIXED Fixed problem with redundant search entries shown in ↵Andrew Productengine
People/Groups/Roles/Members. Bug was caused by adding members with uncached names to search results- when name was uncached, method that added ids to member list, didn't respect the filter. - Fixed by adding members only when their names are cached and match the filter. If name is not cached, LLCacheName::get() is called for such user id, and when name is cached, it calls function that handles adding of user to list depending on filter. - Added default sorting of members by name, added saving of sort order to settings.
2010-10-20STORM-402 : merge with viewer-developmentMerov Linden
2010-10-20STORM-390 : merge with viewer-developmentMerov Linden
2010-10-20STORM-263 : merge to viewer-developmentMerov Linden
2010-10-20STORM-281 : merge to viewer-development + fix indentationMerov Linden
2010-10-20STORM-417 : merge with viewer-developmentMerov Linden
2010-10-20STORM-419 : merge with viewer-developmentMerov Linden
2010-10-20STORM-424 : merge Boroondas changeset to viewer-developmentMerov Linden
2010-10-20STORM-423: fix raw file association in strings.xmlMerov Linden
2010-10-20STORM-417 FIXED Port of SNOW-140 to SG 2.0 : Forced updates not working on MacVadim ProductEngine
The point of this patch is to make the Mac updater code a bit more flexible and reliable than it is right now. The issue is double: * reliability: the string comparison code on the bundle identifier is not UTF8 compliant * flexibility: the bundle identifier is hard coded to match the bundle identifier of LL viewer (i.e. com.secondlife.indra.viewer) so it can't work for another viewer (in particular, it didn't work for Snowglobe). The "bundle identifier" is one of those Mac only thing stored in the Info.plist of a "bundle" (the ".app" folder that's bundling an executable and all its resources and is seen as an application when browsing with the Mac OS X Finder). The patch fixes both issues: * compare correctly UTF8 encoded strings * allow the bundle ID to be passed as a parameter to the updater The patch has really no consequence on LL viewer. It's more a matter of having cleaner, better code. Author: Cypren Christenson Ported and reviewed by: Merov Linden
2010-10-20STORM-419 FIXED <anonymous>' is used uninitialized in this function in ↵Vadim ProductEngine
lldarray.h Author: Robin Cornelius Ported by: Techwolf Lupindo Reviewed by: Merov Linden
2010-10-20bump Development version to 2.4Oz Linden
2010-10-20pull changes back from 2.3 betaOz Linden
2010-10-19STORM-281 : Fix Map FOV frustum when UI size not equal to 1Merov Linden
2010-10-19Bumped viewer version to 2.3.0Dessie Linden
2010-10-19STORM-402 FIXED Fixed adding of people whom you sent IM to Recent list.Andrew Productengine
This regression was caused by fix of STORM-126 in changeset 09f13edf6aa8 where adding of people from mInitialTargetIDs was removed. And it was used to add people whom you P2P im'ed. - Used mInitialTargetIDs to add people whom you P2P im'ed.
2010-10-19STORM-390 FIXED "Place Profile" appeared instead of "Resident Profile" after ↵Vadim ProductEngine
clicking on user name in a nearby chat toast. Now clicking an avatar name opens avatar profile; clicking an object name opens object inspector. This change rolls back the fix of STORM-358.
2010-10-18automated mergeRoxie Linden
2010-10-18STORM-406: Fix for fmod inclusion in llaudio cmakeMerov Linden
2010-10-18STORM-406 : fmod build issue, merge Boroondas changeMerov Linden
2010-10-18Point the events profiles and other components to the new eventsRoxie Linden
web pages
2010-10-16merged VWR-23459 (fixed crash for certain command line options when compiled ↵Boroondas Gupte
against Boost-1.42)
2010-10-16VWR-23459 FIXED Viewer compiled against Boost-1.42 crashes when certain ↵Boroondas Gupte (original fix by Aleric Inglewood)
command line options are given used Aleric's SG2 changeset from http://svn.secondlife.com/trac/linden/changeset/3600 patching file doc/contributions.txt Hunk #1 succeeded at 73 with fuzz 2. patching file indra/newview/llcommandlineparser.cpp Hunk #1 succeeded at 268 with fuzz 1 (offset -8 lines). Edited doc/contributions.txt to create an entry for Aleric and moved the issue ID there (patch wasn't able to place it at the right position, lacking any context).
2010-10-16merged VWR-23455: Don't download FMOD unless INSTALL_PROPRIETARY is TRUEBoroondas Gupte
2010-10-16merged VWR-23455: Don't download FMOD unless INSTALL_PROPRIETARY is TRUEBoroondas Gupte
2010-10-16VWR-23455: Don't download FMOD unless INSTALL_PROPRIETARY is TRUEBoroondas Gupte
2010-10-15Automated merge with file:///Users/oz/Work/viewer-developmentOz Linden
2010-10-15automated mergeRoxie Linden
2010-10-15pull fix for STORM-211Oz Linden
2010-10-15pull fix for STORM-279Oz Linden
2010-10-15pull fix for STORM-376Oz Linden
2010-10-15MergeLeyla Farazha
2010-10-15automated mergeRoxie Linden
2010-10-15pull fix for STORM-304 / STORM-386Oz Linden
2010-10-15fixing ims not logging with display names offLeyla Farazha
2010-10-15automated mergeRoxie Linden
2010-10-15STORM-386 FIXED Disabled higlighting URLs in object names inside the "<name> ↵Vadim ProductEngine
has said something new" textbox that pops up in NEARBY CHAT window.
2010-10-15Automated merge with file:///Users/oz/Work/viewer-developmentOz Linden
2010-10-15STORM-263 FIXED popup menu of Cog button in lower-left of sidebar panel ↵Seth ProductEngine
closing on second click - Changed type of gear menu buttons from LLButton to LLMenuButton in all sidebar panels where gear menu button is used. - Added setMenuPosition(), setMenu() and updateMenuOrigin() to the LLMenuButton. - Moved actions common for displaying a context menu to LLMenuButton::toggleMenu(). - In all sidebar panels where LLButton was replaced with LLMenuButton the following steps were taken: 1. setting gearMenu and its position relative to the menuButton with LLMenuButton::setMenu() 2. setting mouse down callback for the menuButton if needed. 3. calculating the menu origin point with LLMenuButton::updateMenuOrigin() in mouse down callback
2010-10-14Merge from http://hg.secondlife.com/viewer-identity (display names)Leyla Farazha
2010-10-14DN-174Some length of Display Name (username) can cause the name to disappear ↵Leyla Farazha
off of the Buy object floater