summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2012-05-31merge changes for storm-276Oz Linden
2012-05-31STORM-276 Match preferences look to that of the auto-replace functionality ↵Kitty Barnett
in STORM-1738
2012-05-30merge up to 3.3.2-releaseOz Linden
2012-05-30possible fix for storm-1866 (crash when first key in chat is space)Oz Linden
2012-05-26storm-1738: fix dumb pre-checkin changeOz Linden
2012-05-26storm-1738: clarify word recognition codeOz Linden
2012-05-25fix problems due to LLSD-30, and implement persistent settingsOz Linden
2012-05-24storm-1738: fix entry of new abbreviationsOz Linden
2012-05-23storm-1738: restructure code, preferences storage, preferences ui; ui not ↵Oz Linden
completely tested
2012-05-20Merged with viewer-betaKitty Barnett
2012-05-12STORM-1738: fix class name and other coding standards issuesOz Linden
2012-05-12STORM-1738: remove unimplemented notecard target from autoreplace settings ↵Oz Linden
floater
2012-05-12STORM-1738: get autoreplace preferences working, clean up some coding and ↵Oz Linden
naming conventions
2012-05-11missed one setListStyleOz Linden
2012-05-11move preferences from Advanced menu to Chat tab of preferences floaterOz Linden
2012-05-11remove author tracking, non-wordstyle option, and notificationsOz Linden
2012-05-11rename feature from "autocorrect" to "autoreplace", change names accordinglyOz Linden
2012-05-08merge changes for version 3.3.1Oz Linden
2012-05-04merge changes for drtvwr-142Oz Linden
2012-05-04merge changes for drtvwr-140Oz Linden
2012-04-26merge changes for drtvwr-140Oz Linden
2012-04-26MAINT-813 FIXED crash when trying to access the region info after viewer ↵Seth ProductEngine
disconnect. Added checks for LLViewerRegion pointer in LLViewerObject being invalid.
2012-04-24FIX INTL-96 Viewer translation for Set31eli
2012-04-24sync with viewer-developmenteli
2012-04-24OPEN-54: correct JsonCpp include pathBoroondas Gupte
2012-04-23go back to the more elaborate way to find dictionaries (the way that works)Oz Linden
2012-04-23correct mac hunspell lib name, try simpler reference to dictionariesOz Linden
2012-04-23remove debugging prints around packaging the dictionariesOz Linden
2012-04-20merge changes for latest viewer-developmentOz Linden
2012-04-19grumble relative grumble python grumbleOz Linden
2012-04-19reference packages relative to newviewOz Linden
2012-04-19use build directory argument directlyOz Linden
2012-04-19try forcing use of build prefix to copy dictionariesOz Linden
2012-04-19missing paren in dictionary copyingOz Linden
2012-04-18rearrange dictionary copyingOz Linden
2012-04-18fix logging to diagnose path problemOz Linden
2012-04-18add logging to diagnose path problemOz Linden
2012-04-17DRTVWR-139: merge back 3.3.1-beta2 fixesOz Linden
2012-04-17Mac build fix.Seth ProductEngine
2012-04-16sync with viewer-developmenteli
2012-04-16MAINT-922 FIX Client side code to catch the SCRIPT_PERMISSION_TELEPORT ↵callum
request from similator and display a notification Reviewed by Simon
2012-04-14DRTVWR-136: Remove redundant remove_(item|category)() functions.Nat Goodspeed
Incoming changes from two different project repos left viewer-development with LLInventoryModel::removeItem() and removeCategory() plus free functions remove_item() and remove_category() in llinventoryfunctions.cpp. remove_category() was actually the better implementation; migrated its body into LLInventoryModel::removeCategory(). Clearly the previous state of affairs -- with LLInventoryModel::removeItem() plus a remove_category() free function in a very different source file -- fooled two different developers into overlooking the other of the pair. Unfortunately we each added different "missing" functions, leaving us with a complete set of four. Fix existing references to remove_item() and remove_category() free functions.
2012-04-13fix merge conflict in remove_itemOz Linden
2012-04-13merge changes for drtvwr-136Oz Linden
2012-04-13yet another path for the dictionaries package...Oz Linden
2012-04-13merge changes for drtvwr-135Oz Linden
2012-04-13try a different path for the dictionaries package?Oz Linden
2012-04-12CHUI-87 FIXED crash in handling notifications after viewer disconnect.Seth ProductEngine
Notification handlers now use LLHandles to screen channels.
2012-04-12MAINT-891 FIXED Disabled focus return from modal dialog after viewer logoff.Seth ProductEngine
Fixed boost trackable objects usage.
2012-04-11merge changes for drtvwr-137Oz Linden