aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* Applied patch by Qarl Fizz to allow drag selection on plants. See ↵McCabe Maxsted2010-11-057-9/+279
| | | | http://www.qarl.com/qLab/?p=67
* Merge remote branch 'thickbrick/weekly' into weeklyMcCabe Maxsted2010-11-052-5/+5
|\
| * Bug #681: About Land->Audio doesn't do anythingthickbrick2010-11-062-5/+5
| | | | | | | | | | | | Uncomment the code needed for this panel to work. This was commented out in the inital Snowglobe media plugings merge, and somehow we got that too.
* | Added three new resolutions:McCabe Maxsted2010-11-051-2/+10
| | | | | | | | | | | | * 1280x720 (HDV720) * 1440x1080 (HDV1080) * 1920x1080 (HD1080)
* | Removed 640x480 resolution from preferences since the UI doesn't fit when ↵McCabe Maxsted2010-11-051-3/+0
| | | | | | | | using it anymore
* | Merge remote branch 'armin/weekly' into weeklyMcCabe Maxsted2010-11-051-1/+1
|\ \
| * | fix: don't use untested librariesArmin Weatherwax2010-11-061-1/+1
| | |
* | | Set can_edit_text attribute to true for the radar distance slider, fixed the ↵McCabe Maxsted2010-11-051-4/+4
| | | | | | | | | | | | layout and the default being too large (2048 isn't supported on SL. This problem needs a different solution)
* | | Set can_edit_text attribute to true for draw distance, particle count, and ↵McCabe Maxsted2010-11-054-68/+15
| | | | | | | | | | | | imposter count. Also increased the draw distance range to 1024 from 512 and changed the increments from 8 to 4 as better defaults
* | | Changed nickname highlight nick settings from 'nick#' to ↵McCabe Maxsted2010-11-052-9/+9
| | | | | | | | | | | | 'HighlightNickname#' to match the rest of settings.xml. Nicknames set before this commit will need to be set again due to the new preferences name
* | | Fixed option in Prefs > General overlapping (all this layout still needs to ↵McCabe Maxsted2010-11-051-3/+3
| | | | | | | | | | | | be redone and turned into bottom_deltas)
* | | Removed unused 'remember password' option that snuck into the Prefs > ↵McCabe Maxsted2010-11-051-10/+0
| | | | | | | | | | | | General tab. This will be handled by the login manager
* | | Rebranded 'Help' button in preferences to 'Support' and made it point to the ↵McCabe Maxsted2010-11-051-3/+3
| | | | | | | | | | | | Imprudence support page
* | | Changed the order of the chat/im/voice preferences panels to include chat ↵McCabe Maxsted2010-11-051-7/+8
| | | | | | | | | | | | colors more logically
* | | Renamed several preferences panels:McCabe Maxsted2010-11-054-4/+4
| | | | | | | | | | | | | | | | | | | | | * Text Chat -> Chat * Voice Chat -> Voice * Communication -> IMs & Logging * Colors -> Chat Colors
* | | Created new preferences panel to handle chat colors and name highlighting ↵McCabe Maxsted2010-11-0510-277/+478
|/ / | | | | | | (removes the 'Extras' panel from Prefs > Advanced and moves the color options from 'Text Chat')
* | IMP-592: Extend login screen menu bar till the top of the window.Aleric Inglewood2010-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically, this Linden code is just horribly broken. I spend already too much time on this (two days) for dead code, so I settled for a minimal fix for this particular case that works, instead of fixing their code properly. The problem is that without specifying "bottom" the code adds 4 pixels (VPAD) between whatever widget that is added and it's parents top (in LLView::createRect). In order to be sure that bottom is exactly minus the height, I had to specify the height too; hopefully this value is the same for everyone cause theorectically it depends on the font size (4 + fontheight + 4). The default height of the Linden code is only 4 + fontheight (they leave off the VPAD).
* | Center the "loading..." text on the login page.Aleric Inglewood2010-11-052-16/+21
| | | | | | | | | | | | | | The loading.html page is no longer used. Instead embedded html found in panel_login.xml is used. I couldn't get it to show an image, but at least the "loading..." text is now centralized and I changed the background color from black to imprudence-purple.
* | Rename hippo* files to lower case (PART 2 OF 2)Aleric Inglewood2010-11-0578-91/+91
| | | | | | | | | | | | | | | | | | | | | | 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.
* | Rename hippo* files to lower case (PART 1 OF 2)Aleric Inglewood2010-11-058-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Moreover, hippolimits.h is about the class HippoLimits, with uppercase H, so even that doesn't match. Of course, then we immediately rename all hippo* files to lowercase. This patch ONLY renames the file, with no other changes. This is done in order to make sure that git won't get confused ;). All other necessary changes will be in the next commit.
* | Applied patch by Ansariel Hiller for #675: Keywords update to reflect ↵McCabe Maxsted2010-11-052-1/+5
| | | | | | | | changes to llSensor LSL function
* | Applied patch by Nicky Perian for #680: commented out unused references to ↵McCabe Maxsted2010-11-051-54/+55
| | | | | | | | gstreamer post-webkit_plugins in viewer_manifest.py
* | Fixed missing UseLocalChatWithBubbles control introduced in af6877fb (#685), ↵McCabe Maxsted2010-11-051-0/+11
|/ | | | patch by Nicky Perian
* Merged webkit_plugins into weekly. Huzzah! The weekly branch now has ↵McCabe Maxsted2010-11-02140-2976/+8039
|\ | | | | | | browser/media plugin support
| * Fixed streaming video on Windows by updating mime_types_window.xml to the ↵McCabe Maxsted2010-11-021-6/+39
| | | | | | | | version used in Viewer 2
| * Install qtxmlpatterns4.dll on windows.Aleric Inglewood2010-11-021-0/+1
| |
| * Make LLStringUtilBase<T>::null a constant.Aleric Inglewood2010-11-022-2/+2
| |
| * RED-595 was renamed to IMP-595Aleric Inglewood2010-11-021-1/+1
| |
| * Remove explicit dependency of windows on media_plugin_gstreamer010Aleric Inglewood2010-10-281-1/+1
| |
| * Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-2842-141/+1121
| |\
| * | Load mime_types_windows.xml instead of mime_types.xml so we can fallback on ↵McCabe Maxsted2010-10-272-3/+3
| | | | | | | | | | | | the version in the skins directory correctly
| * | Use quicktime instead of gstreamer on WindowsMcCabe Maxsted2010-10-271-14/+14
| | |
| * | Fixed mime_types.xml not being copied on Windows (also fixes plugin dll ↵McCabe Maxsted2010-10-271-13/+26
| | | | | | | | | | | | copying error)
| * | Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-252-22/+33
| |\ \
| * | | Added missing textures to artwork.Aleric Inglewood2010-10-251-0/+1
| | | | | | | | | | | | | | | | | | | | Also fixed textures.xml by adding media_panel_scrollbg.png which is used in the MediaHUD as one of the media_*.png textures, but was lacking from textures.xml.
| * | | Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-243-12/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/doc/contributions.txt Renamed RED --> IMP. Merged entries from both.
| * \ \ \ Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-231-9/+6
| |\ \ \ \
| * \ \ \ \ Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-22119-2518/+4651
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | LindenUserDir fixes, part 2.Aleric Inglewood2010-10-223-33/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the previous commit, the menu text - after logging in - had disappeared. This fixes that.
| * | | | | | LindenUserDir fixes.Aleric Inglewood2010-10-208-44/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Update WebKit Version in About floater.Aleric Inglewood2010-10-191-1/+1
| | | | | | |
| * | | | | | Sync LLViewerMediaImpl::newSourceFromMediaType with SG2Aleric Inglewood2010-10-193-16/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also renamed CookiesEnabled to BrowswerCookiesEnabled. Added BrowserJavascriptEnabled, BrowserPluginsEnabled and PluginAttachDebuggerToPlugins.
| * | | | | | Fix windows mime types and gstreamer plugin name.Aleric Inglewood2010-10-163-486/+8
| | | | | | |
| * | | | | | Rename LLRect::isNull to LLRect::isEmpty (a random thing I picked up from ↵Aleric Inglewood2010-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | snowglobe 2.x).
| * | | | | | RED-595: Manual merge with weekly-webkit.Aleric Inglewood2010-10-157-71/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Plus some white space fixes (TABs --> spaces) in install.xml.
| * | | | | | Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to ↵Robin Cornelius2010-10-10187-11101/+1632
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-10299-4447/+19392
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | Thickbrick Sleaford, Soft Linden: STORM-164 make gcc-4.4 happy about llvosky.hArmin Weatherwax2010-10-101-1/+1
| | | | | | | |
| | * | | | | | Force mime_types.xml to use gstreamer as defaultRobin Cornelius2010-10-102-37/+37
| | | | | | | |
| | * | | | | | Let the gstreamer plugin build on windowsRobin Cornelius2010-10-102-5/+21
| | | | | | | |
generated by cgit v1.1 at 2025-02-23 03:57:32 +0000