summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-06-20Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-06-20fix for SH-1870: can not upload book_collection_1.dae when include texturesXiaohong Bao
2011-06-18mergeDave Parks
2011-06-18SH-828 Fix for using uninitialized data when normals or texture coordinates ↵Dave Parks
are absent from collada file (can now upload meshes without normals or texture coordinates).
2011-06-18Fix for annoying assert that gets triggered when your first login attempt fails.Dave Parks
2011-06-17Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-06-17fix for SH-1783: [PUBLIC] Crash when adding a physics shape.Xiaohong Bao
2011-06-17mergeprep linden
2011-06-17Fix for sh-1586 & sh-1654 # Alt-zooming camera flippingprep linden
2011-06-16mergeBrad Payne (Vir Linden)
2011-06-16Fix for linux build failure, hopefullyBrad Payne (Vir Linden)
2011-06-16mergeBrad Payne (Vir Linden)
2011-06-16SH-1166 FIXBrad Payne (Vir Linden)
2011-06-16mergeprep linden
2011-06-16Fix for camera wonkiness (sh-1654 ...)prep linden
2011-06-15SH-1166 WIPBrad Payne (Vir Linden)
2011-06-15Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-06-15fix for SH-1788: Assert in texture load when uploading textured mesh modelXiaohong Bao
and beyond: fixed the thread-safe and highest texture resolution flaws in the mesh texture uploading flow.
2011-06-15mergeBrad Payne (Vir Linden)
2011-06-15SH-1773 FIXBrad Payne (Vir Linden)
2011-06-15Fix for sh-1771 and also fixed a bug with a never ending load (with eventual ↵prep linden
crash) bug when a visual scene is missing.
2011-06-15merge changes for storm-1298Oz Linden
2011-06-15merge changes for storm-1339Oz Linden
2011-06-15merge changes for storm-1103Oz Linden
2011-06-15merge changes for storm-1313Oz Linden
2011-06-15merge changes for storm-787Oz Linden
2011-06-15merge changes for storm-899Oz Linden
2011-06-15merge changes for storm-1273Oz Linden
2011-06-15STORM-1339 FIXED Making a preventive fix for a crash in ↵Vadim ProductEngine
LLPanelPlaces::onTeleportButtonClicked().
2011-06-14mergeDave Parks
2011-06-14SH-680 Adjust streaming cost scaler to agree with simulator.Dave Parks
2011-06-14merge changes for storm-1342Oz Linden
2011-06-14merge changes for storm-1338Oz Linden
2011-06-14WIP INTL-46 Traditional Chinese translation updateeli_linden
2011-06-14Enabling watchdog timer with timeout of 20.jenn
This is in support of a Viewer crash pile-on. It is intended to ship to Beta, then either be reverted or have an increased timeout prior to shipping to release.
2011-06-14mergeBrad Payne (Vir Linden)
2011-06-13SH-1796 FIXBrad Payne (Vir Linden)
2011-06-13STORM-787 Mute Gestures Button--moved check box down 2 linesJonathan Yap
2011-06-13FIX VWR-25984eli_linden
2011-06-13FIX CT-636 CT-640 DA translation for Set22 and Set1eli_linden
2011-06-13increment viewer version to 2.7.4Oz Linden
2011-06-12STORM-787 Mute Gestures ButtonJonathan Yap
2011-06-12STORM-787 Mute Gestures ButtonJonathan Yap
2011-06-11Fix for under water render going black when deferred rendering and ↵Dave Parks
anti-aliasing enabled.
2011-06-11SH-1778 Physics shape display fix up.Dave Parks
2011-06-10Fix for show object updates not working (and crashing, and behaving badly).Dave Parks
2011-06-10mergeDave Parks
2011-06-10mergeprep linden
2011-06-10SH-1632 - minor camera and far plane tweak. Also need SH-1665 for full ↵prep linden
solution (model needs to stay at the origin - currently it translates during scaling).
2011-06-10mergeDave Parks