summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-05-25merge changes for storm-1156Oz Linden
2011-05-25storm-1156: remove "test day" controls and associated codeOz Linden
2011-05-25merge lastest updates from windlight integration branchOz Linden
2011-05-24MergeDave SIMmONs
2011-05-24STORM-1256 WIP Re-request region settings if our attempt to change them has ↵Vadim ProductEngine
failed.
2011-05-24STORM-1256 WIP Added perpetual indicator for progress of applying changes.Vadim ProductEngine
2011-05-24merge changes for STORM-1277Debi King (Dessie)
2011-05-24STORM-1256 WIP Fixed resetting the Environment tab if a server env. update ↵Vadim ProductEngine
comes while your preference is using personal env. settings. The fix is to re-add server skies to our WL param mgr regardless of user preferences.
2011-05-24STORM-1256 WIP Improvements to region enviroment settings editing.Vadim ProductEngine
* Enable/disable controls according to the region permissions. * Update controls when region settings update comes.
2011-05-23fix VWR-25036eli_linden
2011-05-23FIX VWR-25029eli_linden
2011-05-23FIX VWR-25028eli_linden
2011-05-23FIX VWR-25027eli_linden
2011-05-23EXP-826 FIX Help -> About Secondlife Info is corrupted.callum
2011-05-23FIX VWR-25025 en_xui_changeeli_linden
2011-05-23FIX VWR-25024 en_xui_changeeli_linden
2011-05-23FIX VWR-25023 en_xui_changeeli_linden
2011-05-23FIX VWR-25022 en_xui_changeeli_linden
2011-05-23FIX VWR-24753eli_linden
2011-05-23STORM-1275 FIX viewer gets caught in infinite loop for decompstubNyx (Neal Orman)
Fixed setting the initialized flag for the decomposition stub case (for OS builds) so that the viewer doesn't hang when initializing the stub. Note that initialized will be set to true even when instance will return NULL.
2011-05-23FIX VWR-25016 en_xui_changeeli_linden
2011-05-23STORM-1256 WIP Fixed a crash.Vadim ProductEngine
2011-05-23sync with viewer-developmenteli_linden
2011-05-23STORM-1256 WIP Moved a public method to the appropriate place.Vadim ProductEngine
2011-05-23STORM-1256 WIP Implemented editing region environment settings via the ↵Vadim ProductEngine
Region/Estate floater.
2011-05-23SH-1616 FIX SL client crashes on startup for debug buildsNyx (Neal Orman)
Added more NULL checks for llconvexdecompositionstub, to avoid crashing. Clients won't be able to upload meshes using the stub, but should be able to run the client otherwise.
2011-05-23merge latest changes (post-2.7.0) from viewer-developmentOz Linden
2011-05-23increment viewer version to 2.7.1Oz Linden
2011-05-21fix oops when cleaning up temporary ifndefsOz Linden
2011-05-20correct license headersOz Linden
2011-05-20fix more DOS line endingsOz Linden
2011-05-20merge changes for sh-1591Oz Linden
2011-05-20Revamped viewer cache preference controls.Logan Dethrow
Implemented improved cache control user interface, changes approved by wolf. * Moved viewer cache controls from the setup preference panel to advanced * Changed cache size control slider into a spinner * Readded a clear cache button along with a cache clear confirmation dialog * Renamed the reset button to "Default Location" to clarify its function Related JIRAs: ER-815 ER-816 ER-818 ER-820 ER-821 ER-831
2011-05-20automated merge mesh-development -> davep-mesh-candidate-2010Loren Shih
2011-05-20SH-1252 and SH-1253 WIP.prep linden
2011-05-20Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-05-20STORM-1265: partial fix for region updates; further integration with new ↵Oz Linden
dialogs needed.
2011-05-19STORM-1265: remove region texture tabOz Linden
2011-05-19STORM-1265: code changes for merging the Terrain and Ground Textures tabsOz Linden
2011-05-19SH-1618 FIX -- Lighting and shadows crash ATI macsLeslie Linden
* Fixed ATI mac "lighting and shadows" related crash * Fixed up numerous GL errors on macs related to multiple color formats, the use of glEnable/glDisable on textures above the texture unit count and old ATI-specific code that was not appropriate for Mac. * Disabled SSAO for ATI macs due to it not working with shadows * Ongoing work to properly get shadows and SSAO functioning on ATI macs is required. Reviewed by davep
2011-05-19FIX VWR-25021eli
2011-05-19FIX VWR-25020eli
2011-05-19FIX VWR-25019eli
2011-05-19WIP VWR-25018eli
2011-05-19FIX VWR-25017 en_xui_changeeli
2011-05-19FIX VWR-25015eli
2011-05-19FIX VWR-25011 en_xui_changeeli
2011-05-19FIX VWR-25010 en_xui_changeeli
2011-05-19FIX VWR-25009eli
2011-05-19FIX VWR-24161 en_xui_changeeli
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 11:55:40 +0000