summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Expand)Author
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-30line munging for merge warn-on-failure:unix-eolBrad Payne (Vir Linden)
2012-07-25SH-3258 WIP Adding new switching of new vs old appearance based on appearance...Nyx (Neal Orman)
2012-07-25pull latest pathfinding changes from integration branchOz Linden
2012-07-24Adding a group identifier to the group objects in the pathfinding linksets an...Todd Stinson
2012-07-24merge to viewer-developmentoOz Linden
2012-07-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-07-23PATH-781: Pulling in the new 'owner_is_group' field into the pathfinding object.Todd Stinson
2012-07-23a trivial code change for SH-3073. The change makes sure to clear the textur...Xiaohong Bao
2012-07-23Fix for path-826. Safeguarding against a mull weight being usedprep
2012-07-18Setting the description column of the linkset floater to be a fixed width. H...Todd Stinson
2012-07-18Updating the build tools floater to better handle multi-line creator and owne...Todd Stinson
2012-07-18merge back fixes from 3.3.4-beta5Oz Linden
2012-07-17SH-3258 WIP revert to server-generated texturesNyx (Neal Orman)
2012-07-17MAINT-1223 More aggressive rebuilding of render batches when alpha color valu...Dave Parks
2012-07-17pull back fixes for 3.3.4-beta4Oz Linden
2012-07-16Automated merge with https://bitbucket.org/VirLinden/sunshineNyx (Neal Orman)
2012-07-16SH-3261 WIP Updated texture switching codeNyx (Neal Orman)
2012-07-16MAINT-1223 Fix for alpha updates not triggering LoD updates.Dave Parks
2012-07-16Path-814: Corrected shader fragment compilation error.prep
2012-07-14merge back beta fixes for DRTVWR-180Oz Linden
2012-07-13fix for SH-3235: Bump maps are not loaded until objects change LODXiaohong Bao
2012-07-13Disabling the phantom toggle when the object is volume-detect.Todd Stinson
2012-07-13SH-3267 WIP - extract cof version from avatar appearance message, use to reje...Brad Payne (Vir Linden)
2012-07-13merge changes for DRTVWR-179Oz Linden
2012-07-12Cleaning up some runtime output warning messages about invalid XUI syntax.Todd Stinson
2012-07-12fix for SH-3237: cached sculpties do not load at the correct LOD.Xiaohong Bao
2012-07-12Better optimization for loading avatar names that are already cached.Todd Stinson
2012-07-12SH-3267 WIPBrad Payne (Vir Linden)
2012-07-12MAINT-1262 Fix for crash when setting graphics to LowDave Parks
2012-07-12PATH-807: Ensuring that the "Show in linksets..." and "Show in characters..."...Todd Stinson
2012-07-12Removing debug settings that were in place for pathfinding simulator testing.Todd Stinson
2012-07-12PATH-807: Adding an additional check for if the object is marked as volume-de...Todd Stinson
2012-07-12mergeBrad Payne (Vir Linden)
2012-07-12SH-3267 WIPBrad Payne (Vir Linden)
2012-07-12merge MAINT-1253 fixOz Linden
2012-07-11Fix merge issues - duplicate insertions of codesimon@Simon-PC.lindenlab.com
2012-07-11Pull in viewer-development because it's painful. Merge with runitai's help.simon@Simon-PC.lindenlab.com
2012-07-11SH-3258 WIP initial work: refactoring appearance editing modeNyx (Neal Orman)
2012-07-11fix for SH-3137: delay to issue new http fetching requests if http connection...Xiaohong Bao
2012-07-11MAINT-794 Fix for assert on loading some types of objects before their parents.Dave Parks
2012-07-11MAINT-1253 Rigged meshes in the upload model window now have a material appli...prep
2012-07-11Merging main havok-development-hkai and oz's havok-development-hkaiMatthew Breindel (Falcon)
2012-07-10PATH-807: BUGFIX Filtering which objects will contain the right-click context...Todd Stinson
2012-07-10Adding the example use type labels to the pathfinding linksets floater.Todd Stinson
2012-07-09BUGFIX: Correcting a crash issue that was caused by the rebake navmesh callba...Todd Stinson
2012-07-09merge changes for DRTVWR-175Oz Linden
2012-07-09correct dos line endingsOz Linden