summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2012-07-17pull back fixes for 3.3.4-beta4Oz Linden
2012-07-17Merge viewer-development -> viewer-horde-fixesDon Kjer
2012-07-16Use question-mark-in-diamond for help, rather than skull&crossbones.Nat Goodspeed
2012-07-16MAINT-1270 Fix for some flexi prims becoming flat at some LoDsDave Parks
2012-07-16Automated merge with https://bitbucket.org/VirLinden/sunshineNyx (Neal Orman)
2012-07-16SH-3261 WIP Updated texture switching codeNyx (Neal Orman)
Updated texture switching code to use the proper request URL, even if reverting to a "last known good" baked texture UUID. Viewer should now switch to a locally-generated composite on entering appearance mode, and should remain using such until a new appearance message is received. Still to do: handling adjacent regions with varying support for the new system, fixing switch back to server-generated bakes.
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 ↵Brad Payne (Vir Linden)
reject stale updates
2012-07-13Try to adapt non-English panel_login.xml files for Leo's new layout.Nat Goodspeed
en/panel_login.xml had to be changed to enlarge certain fields for other languages (rather than overriding sizes in each of several other languages). Still need to translate new create_account_text and verify guessed log_in_text.
2012-07-13Merge from lindenlab/viewmaster so we can get rid of itsimon@Simon-PC.lindenlab.com
2012-07-13merge changes for DRTVWR-179Oz Linden
2012-07-13Try reorganizing panel_login.xml per Leo's redesign.Nat Goodspeed
This includes replacing the small "Sign up" link with a "CREATE YOUR ACCOUNT: Start now" button, requiring a small tweak to the C++ code to Do The Right Thing when the button (vs. the link) is clicked.
2012-07-13Remove MaxFPS limit during login, teleports, and logout.Don Kjer
2012-07-13Merge lindenlab/viewer-development => don_linden/viewer-horde-fixesDon Kjer
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 ↵Todd Stinson
characters..." right-click menu option does not show for objects outside the current region.
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 ↵Todd Stinson
volume-detect. Note that this will require Andrew's corresponding server-side change to take effect. However, the viewer change alone should have no neative effect prior to the server being updated.
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-11Adding --skip-gridargs argument to secondlife wrapper script on linux.Don Kjer
2012-07-11Pull in viewer-development because it's painful. Merge with runitai's help.simon@Simon-PC.lindenlab.com
2012-07-11STORM-1898 Add "Copy SLURL" to context menu when right clicking Landmarks in ↵Jonathan Yap
Inventory
2012-07-11SH-3258 WIP initial work: refactoring appearance editing modeNyx (Neal Orman)
Added flags for appearance editing status as well as which textures we should be using at a time. Also refactored so we are not using camera state to track appearance editing mode. Need to add more handling for which textures we actually use.
2012-07-11fix for SH-3137: delay to issue new http fetching requests if http ↵Xiaohong Bao
connection failure happens
2012-07-11MAINT-794 Fix for assert on loading some types of objects before their parents.Dave Parks
2012-07-11MAINT-794 Fix for assert on loading some types of objects before their parents.Dave Parks
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 ↵prep
applied instead of white.
2012-07-11MAINT-1175: Forbid LLRegistry[Singleton]<std::type_info*, ...>.Nat Goodspeed
Back out code that selects LLTypeInfoLookup for the underlying map implementation when KEY = [const] std::type_info*, because LLTypeInfoLookup's API is changing to become incompatible with std::map. Instead, fail with STATIC_ASSERT when LLRegistry's KEY is [const] std::type_info*. Fix all existing uses to use std::type_info::name() string instead.
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 ↵Todd Stinson
context-sensitive menu option of "Show in linksets...".
2012-07-11Added LLPipeline eventhost API. Added ForcePeriodicRenderingTime setting.Don Kjer
2012-07-10Adding the example use type labels to the pathfinding linksets floater.Todd Stinson
2012-07-10Added new settings: DisableAllRenderTypes, DisableAllRenderFeatures, and MaxFPS.Don Kjer
2012-07-09BUGFIX: Correcting a crash issue that was caused by the rebake navmesh ↵Todd Stinson
callback handler unexpectedly changing the navmesh state.
2012-07-09merge changes for DRTVWR-175Oz Linden
2012-07-09correct dos line endingsOz Linden
2012-07-09Merge lindenlab/viewer-development => don_linden/viewer-horde-fixesDon Kjer
2012-07-09SH-3171 FIX switched texture pipeline to use the new cap request URLNyx (Neal Orman)
If we support server side texture baking, requests for baked textures will go through the http url received at login.