summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-05-04Automated merge with ssh://hg.lindenlab.com/richard/viewer-experienceRichard Linden
2011-05-04EXP-584 FIXED View button on bottom bar is hidden when launching Basic ↵Richard Linden
Viewer with Voice options added back in corrected order in which buttons are collapsed so that they collapse right to left
2011-05-04EXP-772 -- Log in failure, keeps saying DNS cannot resolve hostname.Leslie Linden
No real progress on this Jira yet but Mac build was not properly reporting the CURL error string. This check-in fixes that. So far, I have backed out URL related changes between 2.6.2 and 2.6.3 without any change in behavior. Unsure how to proceed next although comparing libcares and libcurl builds between 2.6.2 and 2.6.3 seems like it could be the next logical step. Users experiencing the problem can go back to vewere 2.6.2 or adjust DNS settings to use the google free DNS servers 8.8.8.8 and 8.8.4.4 which should allow them to work around the problem. Reviewed by Richard.
2011-05-04EXP-779 FIX -- Help > About Second Life Reports Kernel Version Twice, ↵Leslie Linden
Instead of OS Version Modified Mac OS_VERSION string to include OS X version number in addition to Kernel version info. DARWIN llcommon build now depends on Carbon in order to provide this functionality. Reviewed by Richard.
2011-05-04hg mergeLeyla Farazha
2011-05-04EXP-759 Opening the Voice preferences window from the up arrow on the speak ↵Leyla Farazha
button turns voice off for user without notice also causes calls to be ended
2011-05-04Merge with http://bitbucket.org/lindenlab/viewer-development (r15992)callum
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-03Sync with viewer-experienceMerov 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-03merge fix for voiceLeyla Farazha
2011-05-02Automated merge with ssh://hg.lindenlab.com/richard/viewer-experienceRichard Linden
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-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-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-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
2011-04-28WIP CT-636 CT-637 PL translation for Light Viewer set1 and set2, adding new ↵Eli Linden
files
2011-04-28WIP INTL-41 set23 DE/FR/ES/PT translation, new filesEli Linden
2011-04-28WIP INTL-41 set23 DE/FR/ES/PT translation; CT-640 set22 PL translationEli Linden
2011-04-28fixed buildRichard Linden
2011-04-28sync up with viewer-development, adding all existing minimal/xui l10n filesEli Linden