Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'thickbrick/weekly' into weekly | McCabe Maxsted | 2011-03-04 | 1 | -0/+3 |
|\ | |||||
| * | Fix #673: IMs & Logging prefs don't persist | thickbrick | 2010-11-30 | 1 | -0/+3 |
| | | | | | | | | | | Enable per-account settings only after we have an account. Also, make settings that are saved locally not depend on UserInfoReply being received. | ||||
* | | postfix: new maximum number of groups in SL. | Armin Weatherwax | 2011-02-27 | 1 | -0/+7 |
| | | |||||
* | | Henri Beauchamp: Display Names support v4 | Armin Weatherwax | 2011-01-24 | 1 | -0/+6 |
| | | |||||
* | | re-enable statistics packet for SL, firstuse warn about it | Armin Weatherwax | 2011-01-20 | 1 | -8/+44 |
| | | |||||
* | | move streaming audio out of gAudiop into its own class. | Armin Weatherwax | 2011-01-04 | 1 | -11/+6 |
|/ | | | | | | * might solve several issues with streaming audio, like: streaming audio not working when the sound effects driver fails. * breaks fmod. Sorry. If you want fmod go fix it, its probably not difficult. | ||||
* | Rename hippo* files to lower case (PART 2 OF 2) | Aleric Inglewood | 2010-11-05 | 1 | -2/+2 |
| | | | | | | | | | | | There was a problem with #include "hippolimits.h" because the file is called hippoLimits.h (with an uppercase L). After some discussion on IRC it was reluctantly decided that filenames should be lowercase, as is done for every Linden file. This is part 2 or 2 (the first part just renamed the files). This part changes all files to make the viewer compile again after the renaming. | ||||
* | Merge branch 'weekly' into webkit_plugins | Aleric Inglewood | 2010-10-28 | 1 | -1/+2 |
|\ | |||||
| * | Fixed the Vivox license prompt appearing when connecting to non-SL grids on ↵ | McCabe Maxsted | 2010-10-18 | 1 | -1/+2 |
| | | | | | | | | startup | ||||
* | | Merge branch 'weekly' into webkit_plugins | Aleric Inglewood | 2010-10-22 | 1 | -3/+18 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/cmake/GStreamer.cmake linden/indra/cmake/GStreamer.cmake was deleted: we're going to try to use system libs, so any improvements that have been made in weekly have been invane. linden/indra/newview/llstartup.cpp Trivial #include collision. One include added another removed. Fixed. linden/indra/newview/lltoolpie.cpp Collision with RLV, pretty trivial. Fixed. linden/indra/newview/viewer_manifest.py Trivial White space fix collision with commenting out of gstreamer libs. Fixed. | ||||
| * | Disabled inventory loading on login unless FetchInventoryOnLogin is true ↵ | McCabe Maxsted | 2010-10-16 | 1 | -2/+5 |
| | | | | | | | | (default to false) | ||||
| * | Applied RLVa-1.1.2-Imprudence.patch by Kitty Barnett | McCabe Maxsted | 2010-10-09 | 1 | -1/+13 |
| | | |||||
* | | LindenUserDir fixes, part 2. | Aleric Inglewood | 2010-10-22 | 1 | -2/+2 |
| | | | | | | | | | | After the previous commit, the menu text - after logging in - had disappeared. This fixes that. | ||||
* | | LindenUserDir fixes. | Aleric Inglewood | 2010-10-20 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | The LindenUserDir (~/.imprudence/first_last/) cannot be initialized before the user logged in. However, several singletons (that only can be initialized once) depend on this directory for initialization. Therefore we have to take care not to instantiate those singletons until after the user logged in. With regard to webit, this fixes the browser_profile (cache and cookies) directory that the builtin browser uses. | ||||
* | | RED-595: Manual merge with weekly-webkit. | Aleric Inglewood | 2010-10-15 | 1 | -4/+0 |
| | | | | | | | | Plus some white space fixes (TABs --> spaces) in install.xml. | ||||
* | | Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to ↵ | Robin Cornelius | 2010-10-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Viewer 2 texture system" This reverts commit 087e15e89930d51c3964329befb273ae3b2d330d. Conflicts: linden/indra/newview/llsurface.cpp linden/indra/newview/llviewerwindow.cpp linden/indra/newview/llvoavatar.cpp linden/indra/newview/pipeline.cpp linden/indra/newview/pipeline.h | ||||
* | | Merge branch 'mccabe-plugins' into plugins_merge | Robin Cornelius | 2010-10-10 | 1 | -12/+23 |
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/doc/contributions.txt linden/indra/cmake/GStreamer.cmake linden/indra/cmake/LLMedia.cmake linden/indra/cmake/OPENAL.cmake linden/indra/llmedia/CMakeLists.txt linden/indra/llprimitive/material_codes.h linden/indra/newview/chatbar_as_cmdline.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llstartup.cpp linden/indra/newview/llviewerwindow.cpp linden/indra/newview/llvoavatar.cpp linden/indra/newview/pipeline.cpp linden/indra/newview/pipeline.h linden/indra/newview/viewer_manifest.py linden/install.xml | ||||
| * | Imprudence style gstreamer plugin (remove llgst, syms and such) | Armin Weatherwax | 2010-09-23 | 1 | -1/+1 |
| | | |||||
| * | port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 ↵ | Armin Weatherwax | 2010-09-23 | 1 | -1/+1 |
| | | | | | | | | texture system | ||||
| * | llmediaplugins first step | Armin Weatherwax | 2010-09-23 | 1 | -16/+21 |
| | | |||||
* | | Fix for Bug #544 | elektrahesse | 2010-09-29 | 1 | -0/+4 |
| | | |||||
* | | Ported gSavedSettings changes from Emerald (as well as modifying a few of ours) | McCabe Maxsted | 2010-09-25 | 1 | -1/+3 |
|/ | |||||
* | Henri Beauchamp: use http map if possible. Fixes broken map in SL + http map ↵ | Armin Weatherwax | 2010-09-13 | 1 | -1/+10 |
| | | | | possible for OS | ||||
* | store our password in the Mac OS keychain | Nemurimasu Neiro | 2010-09-10 | 1 | -3/+42 |
| | | | | much more secure than XORing against a MAC address :) | ||||
* | Applied #472: teleport history from Emerald, patch by Ansariel Hiler, ↵ | McCabe Maxsted | 2010-09-07 | 1 | -0/+10 |
| | | | | feature originally by Zi Ree | ||||
* | added autocorrect functionality and floater | Patrick Sapinski | 2010-08-30 | 1 | -0/+4 |
| | |||||
* | added spellcheck + translation from Emerald Viewer. references to ↵ | Patrick Sapinski | 2010-08-30 | 1 | -1/+7 |
| | | | | modularsystems.sl should be changed! | ||||
* | Added debug setting UseLegacyChatLogsFolder for saving chat.txt and IM logs ↵ | McCabe Maxsted | 2010-08-30 | 1 | -1/+8 |
| | | | | in non-grid-specific folders | ||||
* | Finished up ability to ignore group chat from specific groups. | Jacek Antonelli | 2010-08-28 | 1 | -0/+4 |
| | | | | | Uncheck the "Join group chat" checkbox in the group info window. The list of ignored groups is saved per-account in ignore_groups.xml. | ||||
* | Added vivox license window when enabling voice or starting up for the first ↵ | McCabe Maxsted | 2010-08-28 | 1 | -2/+21 |
| | | | | time (voice can now be included from here on out :) | ||||
* | Added grid info to the title bar along with usernames when allow multiple ↵ | McCabe Maxsted | 2010-08-28 | 1 | -1/+8 |
| | | | | instances is enabled | ||||
* | Applied RLVa-1.0.5e_fix.patch by Kitty Barnett to fix RLVa up to 1.0.5.e | McCabe Maxsted | 2010-08-19 | 1 | -6/+5 |
| | |||||
* | Changed the connecting to region timer to 45 seconds and made it a debug ↵ | McCabe Maxsted | 2010-07-24 | 1 | -1/+2 |
| | | | | setting: ConnectingToRegionTimeout | ||||
* | Added area search to the advanced menu, port from Emerald by Henri Beauchamp | McCabe Maxsted | 2010-07-19 | 1 | -0/+2 |
| | |||||
* | Fixed Bug #262: 'Help > Viewer Help' name does not match behavior (also ↵ | McCabe Maxsted | 2010-07-15 | 1 | -1/+1 |
| | | | | fixed LLWeb::loadURL) | ||||
* | Updated hippo grid manager to include groups and voice info | McCabe Maxsted | 2010-07-03 | 1 | -0/+4 |
| | |||||
* | The 'unable to connect' popup now says the grid name, not 'Imprudence'. | McCabe Maxsted | 2010-06-26 | 1 | -1/+1 |
| | |||||
* | Fixed bug in connecting to region timer | McCabe Maxsted | 2010-06-22 | 1 | -2/+4 |
| | |||||
* | Partially reverted cad41f1 and 65a5856 to help login issues. | Jacek Antonelli | 2010-06-22 | 1 | -9/+2 |
| | | | | | | | | This reverts (except for some parts): - Commit cad41f1ae08927737eca4cd9df25381d78e82304. "Fixed #338: addRegion/removeRegion can trigger a viewer quit" - Commit 65a5856f9567074886f28df59a26433c4b447576. "wip forcing region disconnects to log you out" | ||||
* | Made the AO start loading at startup | McCabe Maxsted | 2010-06-19 | 1 | -0/+8 |
| | | | | (fixes bug where it wouldn't enable unless the window was opened) | ||||
* | Fixed #339: status bar doesn't update buy currency button branding after ↵ | McCabe Maxsted | 2010-06-19 | 1 | -0/+6 |
| | | | | switching grids | ||||
* | Automatically try logging in again if 'Login Failed. You appear to be ↵ | McCabe Maxsted | 2010-06-19 | 1 | -0/+16 |
| | | | | already logged in' error happens on OpenSim | ||||
* | Moved connecting to region failed error to notifications.xml | McCabe Maxsted | 2010-06-19 | 1 | -3/+1 |
| | |||||
* | Fixed #338: addRegion/removeRegion can trigger a viewer quit | McCabe Maxsted | 2010-06-19 | 1 | -3/+10 |
| | |||||
* | wip forcing region disconnects to log you out | McCabe Maxsted | 2010-06-19 | 1 | -2/+2 |
| | |||||
* | Applied snowglobe-0-v14000-AvatarNameInWindowTitle_v1.patch and set the name ↵ | McCabe Maxsted | 2010-06-19 | 1 | -0/+10 |
| | | | | in the window title only when running multiple instances | ||||
* | Fix for the disappearing menu bar bug (#311) | McCabe Maxsted | 2010-06-19 | 1 | -1/+13 |
| | |||||
* | Fixed the login screen sometimes stuck on 'Connecting to Region...' while ↵ | McCabe Maxsted | 2010-06-19 | 1 | -7/+42 |
| | | | | logging onto OpenSim, added debugging info for checking the startup state | ||||
* | Set the imprudence viewer version in xml | McCabe Maxsted | 2010-06-19 | 1 | -4/+4 |
| | |||||
* | Fixed animation list | McCabe Maxsted | 2010-04-25 | 1 | -1/+10 |
| |