summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-05-03Merge.brad kittenbrink
2011-05-03Sync with viewer-experienceMerov Linden
2011-05-03EXP-756 : Move the folder resort to first draw and do it only onceMerov Linden
2011-05-03mergeLeyla Farazha
2011-05-03EXP-778 Bring up corresponding IM window on connect to new voice call.Leyla Farazha
2011-05-03EXP-624 Place profile floater may be opened by SLAppLeyla Farazha
2011-05-03FIX VWR-22337 translation (in utf-8) for "loading terms of service" stringEli Linden
2011-05-03Sync with viewer-experienceMerov Linden
2011-05-03Automated merge with ssh://hg.lindenlab.com/richard/viewer-experienceRichard Linden
2011-05-03Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-mergeRichard Linden
2011-05-03EXP-771 Enable call option in Basic Viewer UILeyla Farazha
2011-05-03Sync with viewer-experienceMerov Linden
2011-05-03EXP-756 : Fix inventory folder ordering on launchMerov Linden
2011-05-03FIX VWR-25074 add missing Danish translationEli Linden
2011-05-03merge fix for voiceLeyla Farazha
2011-05-03CHOP-599: create summary.json early enough to package with installer.Nat Goodspeed
viewer_manifest.py will now package a summary.json file, if present; but previously build.sh didn't create that file until after the viewer build.
2011-05-02Automated merge with ssh://hg.lindenlab.com/richard/viewer-experienceRichard Linden
2011-05-02CHOP-599: if build.sh creates summary.json, package it with viewer.Nat Goodspeed
Recent versions of the viewer's build-dependent build.sh create and upload a summary.json file in the top level of the source repository checkout. Bundle that into the viewer installer. This is the one file that contains the viewer's version.
2011-05-02Automated merge with ↵Richard Linden
bundle:E:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.t3awyz\ssh__richard@hg.lindenlab.com_richard_viewer-experience-merge_2xcevh.hg
2011-05-02WIP VWR-25074 add missing string in English, pending actual Danish translationEli Linden
2011-05-02sync up with viewer-developmentEli Linden
2011-05-02mergeLeyla Farazha
2011-05-02EXP-763 Cannot close IM window using X in upper corner while in a voice callLeyla Farazha
2011-05-02Backed out changeset: d38e4f4982a0Richard Linden
2011-05-02Merge with headcallum
2011-05-02EXP-743 FIX Side bar panel is visible on login screen after gettingcallum
'We're having trouble connecting' message
2011-05-02increment viewer version to 2.6.8Oz Linden
2011-05-02Added tag 2.6.7-start for changeset ce588bc1ae8eOz Linden
2011-05-02STORM-1215: restore INSTALL_PROPRIETARY in Release builds, remove incorrect ↵Oz Linden
use of LL_RELEASE_FOR_DOWNLOAD from ReleaseOS
2011-05-02merge changes for storm-1182Oz Linden
2011-05-02merge changes for storm-1128bOz Linden
2011-05-02merge changes for storm-380Oz Linden
2011-05-02merge changes for vwr-25126Oz Linden
2011-05-02merge changes for storm-229Oz Linden
2011-05-02merge changes for storm-956Oz Linden
2011-04-29STORM-1213 : pull from viewer-experience-mergeMerov Linden
2011-04-29mergeLeyla Farazha
2011-04-29EXP-742 FIX [PUBLIC] CTRL-ALT-w doesn't "spin_over"callum
2011-04-29EXP-761, EXP-758Leyla Farazha
2011-04-29EXP-769 Group call requests received in Basic modeLeyla Farazha
2011-04-29STORM-1207 and STORM-1211 : pull l10n changes from eli's repoMerov Linden
2011-04-29EXP-623 FIX Selecting fly option while on click to walk path flys avatar tocallum
end point but avatar spins and shakes when arriving at click point
2011-04-29Merged with viewer-development.Ricky Curtice
The reason was to manually resolve a couple of merge problems, as upstream has had several changes since this was applied, and some of the changes overlapped.
2011-04-29WIP CT-641 PL translation for Viewer set23, new filesEli Linden
2011-04-29WIP CT-641 PL translation for Viewer set23Eli Linden
2011-04-29STORM-1208 Mockup: "Top level menu 'Environment Editor'"Paul ProductEngine
2011-04-29STORM-1205 Add "Environment" tab to the "Region/Estate" floaterPaul ProductEngine
STORM-1201 Mockup: "Create/Edit Sky Preset" floater STORM-1199 Mockup: "Delete Water/Sky Preset", "Delete Day Cycle" floaters STORM-1198 Mockup: "Create/Edit Day Cycle" floater STORM-1197 Mockup: "Create/Edit Water Preset" floater STORM-1196 Mockup: Environment Settings floater
2011-04-28STORM-1039 FIXED Bad iterator access in llavatarnamecache.cpp:564Richard Linden
missed else case
2011-04-28fixed build (again)Richard Linden
2011-04-28STORM-1039 FIXED Bad iterator access in llavatarnamecache.cpp:564Richard Linden
fixed crash on startup