summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-02-23Merge: Backed out changes for STORM-336 for merge due to complexity, will ↵Loren Shih
need to apply these manually.
2011-02-23Automated merge with ssh://hg@bitbucket.org/lindenlab/viewer-developmentOz Linden
2011-02-23STORM-1019 Add ability to display beacons for Media on a Prim objectsRobin Cornelius
Changes merged into viewer 2 by Jonathan Yap
2011-02-23SH-1019 Attempt at removing dependency on .net framework from colladadom.dllDave Parks
2011-02-23SOCIAL-545 FIX Figure out how to configure skylight-specific settingsRichard Linden
added comments and cleaned up code
2011-02-23separate vertex buffer and index buffer when map/unmap VBO. can be treated ↵Xiaohong Bao
as part of STORM-1011. reviewed by davep.
2011-02-23Fixes from merge of viewer-development -> mesh-development.Loren Shih
2011-02-23Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-22SOCIAL-545 WIP Figure out how to configure skylight-specific settings while ↵Richard Linden
retaining relevant user settings (login account name, etc.) converted settings_file.xml to use param block descriptions for easier modification added session settings file and user session settings file for per-session config overrides
2011-02-22removed useless autologin settingRichard Linden
2011-02-22SOCIAL-545 WIP Figure out how to configure skylight-specific settings while ↵Richard Linden
retaining relevant user settings (login account name, etc.)
2011-02-22mergeDave Parks
2011-02-22SH-874 Better VBO usage hints, most notably don't use VBOs for occlusion ↵Dave Parks
queries if GL is set to not use VBOs for stream draw.
2011-02-22mergeDave Parks
2011-02-22SH-438 Use node name instead of mesh name for object names when importing ↵Dave Parks
meshes.
2011-02-22windows uses updated ogg-vorbis archive.Alain Linden
2011-02-22update vstool to support vs2010.Alain Linden
2011-02-22Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-02-22set "RenderVBOMappingDisable" to be true by default to stop VBO memory leaking.Xiaohong Bao
2011-02-22Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010Alain Linden
2011-02-22update google_breakpad archive usage on windows.Alain Linden
2011-02-22more fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused ↵Xiaohong Bao
leaking.
2011-02-22STORM-28 FIXED Added the ability to send agent's own calling card to others.Seth ProductEngine
- Added creating own calling card for the user to be able to share it with other residents. - Moved calling cards synchronization with friends list to the viewer start up. Previously synchronized upon opening the Friends tab in People side panel. - Calling cards for non-friends are not removed upon calling cards synchronization with friends list. - Enabled "Share" menu item for calling cards in inventory.
2011-02-22STORM-889 FIXED Put Link/Unlink in Edit PanelPaul ProductEngine
- Moved callbacks for Link/Unlink to the LLSelectMgr - Binded Link/Unlink callbacks with buttons in Build Floater - Replaced view_listener_t usage for Link, Unlink, EnableLink, EnableUnlink with boost::bind
2011-02-21Changes windows build and PNG cmake to reflect latests libpng buildssquire
2011-02-19Do not add <jsonpath>/include/json as an include director. Instead use ↵Nicky
<jsonpath>/include. Otherwise include/json/features.h will mask /usr/include/features.
2011-02-23Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010Oz Linden
2011-02-21change host reverse lookup test to use our own host (linux.org failed)Oz Linden
2011-02-19Pull in FreeType 2.4.4 for Windows (built using AutoBuild)callum
2011-02-19Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010Oz Linden
2011-02-19Automated merge with file:///Users/oz/Work/V-DOz Linden
2011-02-19make sure parallel builds are off for my test repos (and clean out some ↵Oz Linden
obsolete entries)
2011-02-18Merge.brad kittenbrink
2011-02-18Fix for failure to link Release builds due to :Release being an invalid path ↵brad kittenbrink
name on windows.
2011-02-18Fix for packaging failure. Installer was missing the SecondLife.exe binarybrad kittenbrink
due to improperly disabled msvcrt manifest checking. reviewed by jenn.
2011-02-18use improved packaging for jsoncppOz Linden
2011-02-18Automated merge with ssh://bitbucket.org/oz_linden/viewer-vs2010Oz Linden
2011-02-18Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010Alain Linden
2011-02-18remove installable mesa for windows; not used.Alain Linden
2011-02-18Code cleanup and removed hacky code support for some old legacy rig typesprep linden
2011-02-18Merge with headcallum
2011-02-18Pull in autobuild derrived jpeglib (version 8c) for Windows MSVC 2010callum
2011-02-18mergeDave Parks
2011-02-18SH-948 don't occlusion cull everything when deferred rendering is enabledDave Parks
2011-02-18pull changes from vs2010Oz Linden
2011-02-18Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010Oz Linden
2011-02-18merge max fixes from merov.Andrew A. de Laix
2011-02-18Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-18BUG STORM-1004 FIXED Unblocking/blocking name sometimes deletes identically ↵paul_productengine
named entry, but of different TYPE LLMuteList stores muted objects in two sets: set of names and set of ids. Avatar objects are stored by ids (set of ids), other objects can be stored both by name(set of names) or ids - Delete items from corresponding set (from set of names or ids), not form both sets at time. - Improved isMuted method's logic. Now if avatar is tested whether it's muted or not, don't search its name in the set of names.
2011-02-18merge changes for viewer-vs2010Oz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 10:43:31 +0000