aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llstartup.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'mccabe/exp' into weeklyDavid Seikel2011-03-201-1/+18
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: (Keeping these around as a record, there was some strangeness. .gitignore linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llfloaterregioninfo.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/skins/default/html/en-us/loading-error/index.html linden/indra/newview/skins/default/html/en-us/loading/loading.html linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/install.xml
| * Merge remote-tracking branch 'armin/exp' into expJacek Antonelli2011-03-191-0/+2
| |\
| | * Henri Beauchamps version of Sione Lomus media filter patch.Armin Weatherwax2011-03-131-0/+2
| | | | | | | | | | | | | | | | | | from http://sldev.free.fr/ : "MediaFilter_v3: based on code by Sione Lomu with a couple of bugfixes by Tonya Souther, this improved patch brings media and streaming audio URLs filtering (to prevent IP ripping by so-called security systems which violate the SL TOS by catching your IP and associating your various avatars with it, thus violating your anonimity). Beside empowering your viewer with allow/deny/blacklist/whitelist functions per domain, this improved patch makes the difference between external servers (domains names filtering) and in-world servers (scripted objects with built-in HTTP servers). I also fixed various bugs, security holes and shortcomings, refactored the code and improved it, and added a whitelist/blacklist erasing function." Imprudence changes: added "MediaFilter" debug to be able to inspect the full url and media texture uuid
| * | Fixed bad line endings (CRLF) in many files.Jacek Antonelli2011-03-181-11/+11
| | | | | | | | | | | | | | | Windows users, please set "autocrlf = input" or "autocrlf = true" in your .git/config [core] section to avoid this in the future.
| * | Merge in Var Sized Regions into the Imprudence Experimental.RevolutionSmythe2011-03-181-1/+13
| |/
| * Merge remote branch 'thickbrick/weekly' into weeklyMcCabe Maxsted2011-03-041-0/+3
| |\
| | * Fix #673: IMs & Logging prefs don't persistthickbrick2010-11-301-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.
* | | Privacy issue - Don't send private data across the 'net.David Seikel2011-03-031-3/+3
| | | | | | | | | | | | | | | Yes, this makes the meta-impy viewer non compliant with LL's TPVP, we don't care this is a viewer for the meta grid. We care about privacy. We have our own effective methods of implementing bans.
* | | Merge branch 'branding' into weekly, with some post merge branding tweeks.David Seikel2011-03-011-8/+8
|\ \ \ | |/ / |/| |
| * | Unbranding. Todays word is "linden".David Seikel2011-02-251-4/+4
| | |
| * | Merge branch 'weekly' into brandingDavid Seikel2011-02-201-19/+56
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts (solved): linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llappviewerwin32.cpp
| * | | Revert "Comment out the server tellinsg us what the search URL is, seems the ↵David Seikel2011-02-121-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server sends garbage." This reverts commit c7f818d42ec4e2a2b8b27bfd4dbfaf4fc8beb7eb. The server is now fixed.
| * | | Comment out the server tellinsg us what the search URL is, seems the server ↵David Seikel2011-02-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | sends garbage. Should revert this when the server is fixed. Also explains why some viewers don't have working search.
| * | | Change imprudence -> meta-impy, though not the URLs. Probably some will ↵David Seikel2011-02-091-4/+4
| | |/ | |/| | | | | | | | | | | | | need to be reverted later. Changed file names to.
* | | postfix: new maximum number of groups in SL.Armin Weatherwax2011-02-271-0/+7
| |/ |/|
* | Henri Beauchamp: Display Names support v4Armin Weatherwax2011-01-241-0/+6
| |
* | re-enable statistics packet for SL, firstuse warn about itArmin Weatherwax2011-01-201-8/+44
| |
* | move streaming audio out of gAudiop into its own class.Armin Weatherwax2011-01-041-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 Inglewood2010-11-051-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_pluginsAleric Inglewood2010-10-281-1/+2
|\
| * Fixed the Vivox license prompt appearing when connecting to non-SL grids on ↵McCabe Maxsted2010-10-181-1/+2
| | | | | | | | startup
* | Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-221-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 Maxsted2010-10-161-2/+5
| | | | | | | | (default to false)
| * Applied RLVa-1.1.2-Imprudence.patch by Kitty BarnettMcCabe Maxsted2010-10-091-1/+13
| |
* | LindenUserDir fixes, part 2.Aleric Inglewood2010-10-221-2/+2
| | | | | | | | | | After the previous commit, the menu text - after logging in - had disappeared. This fixes that.
* | LindenUserDir fixes.Aleric Inglewood2010-10-201-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 Inglewood2010-10-151-4/+0
| | | | | | | | Plus some white space fixes (TABs --> spaces) in install.xml.
* | Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to ↵Robin Cornelius2010-10-101-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_mergeRobin Cornelius2010-10-101-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 Weatherwax2010-09-231-1/+1
| |
| * port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 ↵Armin Weatherwax2010-09-231-1/+1
| | | | | | | | texture system
| * llmediaplugins first stepArmin Weatherwax2010-09-231-16/+21
| |
* | Fix for Bug #544elektrahesse2010-09-291-0/+4
| |
* | Ported gSavedSettings changes from Emerald (as well as modifying a few of ours)McCabe Maxsted2010-09-251-1/+3
|/
* Henri Beauchamp: use http map if possible. Fixes broken map in SL + http map ↵Armin Weatherwax2010-09-131-1/+10
| | | | possible for OS
* store our password in the Mac OS keychainNemurimasu Neiro2010-09-101-3/+42
| | | | much more secure than XORing against a MAC address :)
* Applied #472: teleport history from Emerald, patch by Ansariel Hiler, ↵McCabe Maxsted2010-09-071-0/+10
| | | | feature originally by Zi Ree
* added autocorrect functionality and floaterPatrick Sapinski2010-08-301-0/+4
|
* added spellcheck + translation from Emerald Viewer. references to ↵Patrick Sapinski2010-08-301-1/+7
| | | | modularsystems.sl should be changed!
* Added debug setting UseLegacyChatLogsFolder for saving chat.txt and IM logs ↵McCabe Maxsted2010-08-301-1/+8
| | | | in non-grid-specific folders
* Finished up ability to ignore group chat from specific groups.Jacek Antonelli2010-08-281-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 Maxsted2010-08-281-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 Maxsted2010-08-281-1/+8
| | | | instances is enabled
* Applied RLVa-1.0.5e_fix.patch by Kitty Barnett to fix RLVa up to 1.0.5.eMcCabe Maxsted2010-08-191-6/+5
|
* Changed the connecting to region timer to 45 seconds and made it a debug ↵McCabe Maxsted2010-07-241-1/+2
| | | | setting: ConnectingToRegionTimeout
* Added area search to the advanced menu, port from Emerald by Henri BeauchampMcCabe Maxsted2010-07-191-0/+2
|
* Fixed Bug #262: 'Help > Viewer Help' name does not match behavior (also ↵McCabe Maxsted2010-07-151-1/+1
| | | | fixed LLWeb::loadURL)
* Updated hippo grid manager to include groups and voice infoMcCabe Maxsted2010-07-031-0/+4
|
* The 'unable to connect' popup now says the grid name, not 'Imprudence'.McCabe Maxsted2010-06-261-1/+1
|
* Fixed bug in connecting to region timerMcCabe Maxsted2010-06-221-2/+4
|
generated by cgit v1.1 at 2025-01-25 06:19:44 +0000