summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-05-25Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-05-25EXP-1942,EXP-1945: More robust handling and syncing of the maturity preference.Todd Stinson
2012-05-25EXP-1942, EXP-1945: Improved handling of the maturity preference change ↵Todd Stinson
response. Still needs work though.
2012-05-24BUILDFIX: Correcting linux and mac build issues.William Todd Stinson
2012-05-24EXP-1942,EXP-1945: Altering behavior when setting maturity preference to ↵Todd Stinson
check the server response in an effort to ensure the viewer and server remain in sync. This is a partial commit as I still need to add user behavior and notifications when things go wrong.
2012-05-24Removing unused setting that is blocking my path to commit the subsequent ↵Todd Stinson
change.
2012-05-24EXP-1948: Ensuring that we show the maturity changed notification in the ↵Todd Stinson
case of a teleport failure on the second attempt.
2012-05-23Removing some code that allowed the viewer to toggle the user's maturity ↵Todd Stinson
access level. But only toggling it in the viewer leads to some really bad discontinuities with the server's actual access level for the user.
2012-05-23Removing cruft code that is no longer used.Todd Stinson
2012-05-23EXP-1949: Altering the ignore text for the dialogs related to adult check.Todd Stinson
2012-05-23EXP-1947: Altering notification toasts in the case of a teen user.Todd Stinson
2012-05-23EXP-1946: Adding a missing teleport failure message.Todd Stinson
2012-05-23EXP-1944: Changing the default answer for the LandClaimAccessBlocked_Change ↵Todd Stinson
and LandBuyAccessBlocked_Change notifications.
2012-05-22EXP1-1945: Adding in a flow to catch other cases of teleportation failures ↵Todd Stinson
due to maturity levels and bad network access. Still need better copy for the error message.
2012-05-21EXP-1943: Incorporating Leo's new copy changes for notifications.Todd Stinson
2012-05-21EXP-1941: Adding in debug setting to force enable purchase flow disregarding ↵Todd Stinson
other checks including maturity.
2012-05-21EXP-1928: Restoring the flow for non-teleport-failure messages through the ↵Todd Stinson
special notification handler.
2012-05-18MAINT-959 FIX [PUBLIC]Trouble resizing tabbed floatersRichard Linden
don't auto position other floater when it is hosted
2012-05-17EXP-1940: BUGFIX Correcting issue with changing maturity setting and ↵Todd Stinson
teleporting from dialog did not work on agni. Problem stemmed from 2 issues. 1) The server responded with different results between aditi and agni due to some changes in the Pathfinding project. 2) The viewer was actually sending two separate requests to change to the same preference setting. This fixes both issues.
2012-05-17EPX-1938: Adding a special behavior for the NotAgeVerified notification to ↵Todd Stinson
display either an ignorable modal dialog or a toast-style notification. Also, altering the copy for the notifications.
2012-05-17EXP-1937: Updating copy to change 'age-verified' to 'age 18 or older'.Todd Stinson
2012-05-17EXP-1928: Constructing the new maturity preferences flow for the case of a ↵Todd Stinson
teleport via lure (which cannot be restared).
2012-05-17EXP-1928: Minor tweak to ensure that the case of the copy for content type ↵Todd Stinson
is lower-case.
2012-05-17EXP-1928: Handling the rare case that the user preferences cannot be ↵Todd Stinson
successfully changed, and reporting that to the user.
2012-05-17EXP-1928: Implementing copy changes to notifications.Todd Stinson
2012-05-17EXP-1928: Adding functionality to show either a modal notification dialog or ↵Todd Stinson
the toast-style notification if a teleport fails due to maturity preferences.
2012-05-16EXP-1928: Changing the actual copy for the teleport and maturity preference ↵William Todd Stinson
notifications.
2012-05-15EXP-1928: Removing ability to restart a teleport via lure because the ↵Todd Stinson
re-attempt will fail on the server.
2012-05-15EXP-1928: Removing some commented asserts following more development testing.Todd Stinson
2012-05-11EXP-1928: First pass at building the functionality to restart teleport after ↵Todd Stinson
increasing the maturity preference level to match the intended teleport region. There are probably still some cases that are broken and bugs.
2012-05-10EXP-1928: Adding fundamentals for managing a teleport request in such a way ↵Todd Stinson
that it can be restarted.
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-25merge changes for wolf-318Oz 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-25Try to suppress spurious Mac ld warnings (lib/release/Release dir).Nat Goodspeed
Mindful that some autobuild packages populate only packages/lib/release (rather than packages/lib/debug), Linking.cmake always appends packages/lib/release to CMake's link_directories() directive. But since CMake always appends CMAKE_BUILD_TYPE to those directories, we end up with a phantom packages/lib/release/Release directory on the search path. This would be harmless except that the Mac's 'ld' command produces a warning. These warnings quickly make TC's "Important Messages" output useless. Try appending packages/lib/release only when the build type isn't already Release.
2012-04-25WOLF-318: change default verbosity of some unit tests to keep them out of ↵Oz Linden
the logs when passing WOLF-363: (partial) correct ordering of cleaning build dir vs running 'autobuild install'
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-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-14Touched a file to fix the TC build.Seth ProductEngine
2012-04-13merge changes for drtvwr-135Oz Linden