summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2012-05-08Now trying to get linux working. libllcommon is picking up .soMonty Brandenberg
boost libraries when we tend to want statics. Try to work around that for the moment.
2012-05-04merge changes for drtvwr-142Oz Linden
2012-05-04merge changes for drtvwr-140Oz Linden
2012-05-02SH-3128 FIX - log message cleanup for avatar rezzingBrad Payne (Vir Linden)
2012-05-02merge viewer-release to dranoBrad Payne (Vir Linden)
2012-05-01MergeXiaohong Bao
2012-05-01fix a sculpt crashXiaohong Bao
2012-05-01for SH-3118: add a toggle "TextureFetchDebuggerEnabled" to turn the console ↵Xiaohong Bao
on and off.
2012-04-30Fix sculpties being deleted while being still in use in the sceneMerov Linden
2012-04-30SH-3124 : Fix crash on exit on MacMerov Linden
2012-04-27fix for a crash on sculptXiaohong Bao
2012-04-27fix for a crash on "refetch vis cache"Xiaohong Bao
2012-04-27fix a crash on cache writeXiaohong Bao
2012-04-27fix some flaws for SH-3104Xiaohong Bao
2012-04-27Pull merge from drano-sh-3086Merov Linden
2012-04-26SH-3104 : Implemented HTTP bulk fetch for texture debug consoleMerov Linden
2012-04-26a fix for SH-3097Xiaohong Bao
2012-04-26for SH-3097: introducing texel pixel ration adjustmentXiaohong Bao
2012-04-26For SH-3121: collect time of reloading all textures from cache and through ↵Xiaohong Bao
HTTP when all objects loading are done.
2012-04-26merge changes for drtvwr-140Oz Linden
2012-04-26Automated merge with http://hg.secondlife.com/viewer-releaseNat Goodspeed
2012-04-26tracking for copy-to-wear inventory failuresBrad Payne (Vir Linden)
2012-04-26Bring llcorehttp into the compile and link phases. Windows looks okay ↵Monty Brandenberg
though it's a dead library so far.
2012-04-25for subtasks SH-3118, SH-3112, SH-3110, SH-3106, SH-3091 for SH-3086:Xiaohong Bao
As a viewer architect, I would like to understand how fast each of the components of the texture pipeline can run in isolation
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-23more phase tracking for inventory opsBrad Payne (Vir Linden)
2012-04-22remove a now-unused uniform.Adam Moss
2012-04-22and another!Adam Moss
2012-04-22remove a frightening llwarns that was just there for my own education.Adam Moss
2012-04-21STORM-1819: Ternary/graded shadow supportAdam Moss
missed a few spots: cleanup: get rid of the no-op 'mex' function in the shaders which was being used as a dummy replacement for 'mix'
2012-04-21STORM-1819: Ternary/graded shadow supportAdam Moss
cleanup: get rid of the no-op 'mex' function in the shaders which was being used as a dummy replacement for 'mix'
2012-04-21STORM-1819: Ternary/graded shadow supportAdam Moss
a bunch of trivial clean-ups and commentary.
2012-04-21STORM-1819: Ternary/graded shadow supportAdam Moss
Coalesced patchset.
2012-04-19startup phase tracking added to appearance metricsBrad Payne (Vir Linden)
2012-04-19Move phase tracking to its own set of classes inside LLViewerStats - ↵Brad Payne (Vir Linden)
simplifies llvoavatar and allows adding such tracking to classes that live outside the avatar lifetime
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-13Final pull from viewer-thx1138Merov Linden
2012-04-13merge changes for drtvwr-135Oz Linden
2012-04-13SH-3080 : Fix wrong settings reading code (will crash on some machine)Merov Linden
2012-04-13Pull from viewer-thx1138Merov Linden
2012-04-12SH-3081 : Implement TextureCameraMotion settings as well as faster loading ↵Merov Linden
when the camera is still