Commits

Show all
Author Commit Message Labels Comments Date
Scott Lawrence
merge changes for drtvwr-142
Tags
3.3.2-beta1
Seth ProductEngine
MAINT-813 FIXED crash when trying to access the region info after viewer disconnect. Added checks for LLViewerRegion pointer in LLViewerObject being invalid.
Scott Lawrence
merge changes for drtvwr-140
Scott Lawrence
merge changes for wolf-318
nat_linden
Try to suppress spurious Mac ld warnings (lib/release/Release dir). 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'…
Scott Lawrence
WOLF-318: change default verbosity of some unit tests to keep them out of the logs when passing WOLF-363: (partial) correct ordering of cleaning build dir vs running 'autobuild install'
Boroondas Gupte
OPEN-54: correct JsonCpp include path
Scott Lawrence
merge changes for drtvwr-140
eli
FIX INTL-96 Viewer translation for Set31
eli
sync with viewer-development
eli
sync with viewer-development
Scott Lawrence
merge back tags for 3.3.1-release
Scott Lawrence
DRTVWR-139: merge back 3.3.1-beta2 fixes
callum
MAINT-922 FIX Client side code to catch the SCRIPT_PERMISSION_TELEPORT request from similator and display a notification Reviewed by Simon
nat_linden
DRTVWR-136: Remove redundant remove_(item|category)() functions. 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::rem…
Scott Lawrence
gratuitous change to force new codeticket number
Scott Lawrence
fix merge conflict in remove_item
Scott Lawrence
merge changes for drtvwr-136
nat_linden
CHOP-854: Use new LLInventoryModel::removeObject() to discard offer. 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.
nat_linden
CHOP-854: Make LLInventoryModel::removeItem() call changeItemParent(). The body of removeItem() was already nearly identical to the body of changeItemParent(); this eliminates the redundancy. Improve logging for changeItemParent().
nat_linden
CHOP-854: move change_(item|category)_parent() into LLInventoryModel. 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.
Scott Lawrence
merge changes for drtvwr-135
Vaalith
storm-64: One more toast on failure to verify initial image, and changed a bool to enum
Vaalith Jinn
STORM-64: Added toasts to display critical errors during update cycle.
Scott Lawrence
STORM-1837: check for valid png header before attempting to decode
Scott Lawrence
STORM-1787 remove dead code that causes spurious build log error reports
Nicky Perian
STORM-1828 Change write to location from LL_PATH_CHARACTER to 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.
Scott Lawrence
merge fix for storm-1833
Jonathan Yap
STORM-1833 Square char is presented in list of recompilation for script with error Subtask of STORM-637
Scott Lawrence
merge changes for storm-1823
  1. Prev
  2. Next