summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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
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
2012-04-10storm-64: One more toast on failure to verify initial image, and changed a ↵Vaalith
bool to enum
2012-04-09FIX VWR-28730 JA terminology consistency fixeli
2012-04-09STORM-64: Added toasts to display critical errors during update cycle.Vaalith Jinn
2012-04-06STORM-1837: check for valid png header before attempting to decodeOz Linden
2012-04-03STORM-1828 Change write to location from LL_PATH_CHARACTER toNicky Perian
LL_PATH_USER_SETTINGS. This will allow a common write location for development and installed configurations. Should correct installed configuration from permission failures on windows systems where writing to the install directory requires elevation of rights to administrator.
2012-04-06merge fix for storm-1833Oz Linden
2012-04-06STORM-1833 Square char is presented in list of recompilation for script with ↵Jonathan Yap
error Subtask of STORM-637
2012-04-03merge changes for drtvwr-132Oz Linden
2012-04-02sync with viewer-developmenteli
2012-04-02merge changes for storm-1823Oz Linden
2012-04-02merge changes for storm-1822Oz Linden
2012-04-02merge changes for storm-1821Oz Linden
2012-04-02merge changes for storm-1816Oz Linden
2012-04-02merge changes for storm-637Oz Linden
2012-03-30merge changes for vmrg-229Oz Linden
2012-03-30merge changes for vmrg-233Oz Linden
2012-03-30MAINT-813 FIXED Potential fix for a crash at ↵Vadim ProductEngine
LLViewerRegion::getPosGlobalFromRegion. As far as I can tell, if login fails with the "Region has begun the logout process" message, gAgentAvatarp gets destroyed, which leads to the crash. Adding a check that should prevent it (could not reproduce to make sure).
2012-03-27CHOP-854: Use new LLInventoryModel::removeObject() to discard offer.Nat Goodspeed
Introduce new LLInventoryModel::removeCategory() method comparable to removeItem(), but for folder objects (using changeCategoryParent() rather than changeItemParent()). Introduce removeObject() method that calls one of the above, depending on runtime object type.
2012-03-27CHOP-854: Make LLInventoryModel::removeItem() call changeItemParent().Nat Goodspeed
The body of removeItem() was already nearly identical to the body of changeItemParent(); this eliminates the redundancy. Improve logging for changeItemParent().
2012-03-27CHOP-854: move change_(item|category)_parent() into LLInventoryModel.Nat Goodspeed
It's not really clear why they're in llinventoryfunctions.{h,cpp} instead of LLInventoryModel, and in fact LLInventoryModel::removeItem() already contains code essentially cloned from change_item_parent() -- or perhaps vice-versa. This changeset addresses only migrating the functions, and fixing up existing references, to simplify code review.
2012-03-27merge fix for MAINT-710Oz Linden
2012-03-27MAINT-710: Fix for VertexBufferStrider could not find valid vertex data. ↵Oz Linden
(from Firestorm)
2012-03-27Tweaked the sun's glow to be less powerful.Jonathan Goodman
2012-03-26OPEN-138 Intermittent write to character/new archetype.xml from ↵Nicky Perian
Develop->Avatar-> Character Tests->Apperance To XML. Add explicit outfile.close() method before returning to caller. Add llinfos for file location as a troubleshooting aid.
2012-04-02storm-64: Local TexturesVaalith Jinn
2012-03-26mergeDave Parks
2012-03-26Merging latest changes for normalized blinn-phong.Jonathan Goodman
2012-03-23EXP-1925 WIP Inventory folders being pasted to are hidden during a paste ↵Richard Linden
operation potential fix by not changing mostfiltereddescendant flag when dirtying folder as new contents arrive
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 15:54:56 +0000