aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fixed View > Web Browser sometimes loading the external browser and made it ↵McCabe Maxsted2010-11-122-3/+15
| | | | a menu item check rather than a call
* Fixed the align tool label not hiding when switching tabs in the tools windowMcCabe Maxsted2010-11-121-0/+2
|
* Patch by Eryn: fixed the tools window not having enough room to display the ↵McCabe Maxsted2010-11-121-2/+2
| | | | ruler after applying Qarl's align patch
* Applied 8th batch of German translations from ErynMcCabe Maxsted2010-11-1212-143/+348
|
* Fixed fontconfig library not being set for Linux-onlyMcCabe Maxsted2010-11-122-8/+17
|
* Merge remote branch 'aleric/SNOW-713' into weeklyMcCabe Maxsted2010-11-123-3/+15
|\
| * Merge branch 'weekly' into SNOW-713Aleric Inglewood2010-11-127-1/+242
| |\
| * | Add support for using ld.gold on linux.Aleric Inglewood2010-11-123-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To use ld.gold configure with: -DCMAKE_EXE_LINKER_FLAGS:STRING="-Wl,-use-gold". ld.gold links the viewer on my machine in 8 seconds, as opposed to 19 seconds with ld.bfd. Moreover, it uses a LOT less memory during linking (about 750 MB instead of 2.5 GB!). Thanks to Siana Gearz for pointing out that ld.gold is so much faster.
| * | Merge branch 'weekly' into SNOW-713Aleric Inglewood2010-11-103-2/+16
| |\ \
* | \ \ Merge remote branch 'jacek/SNOW-713' into weeklyMcCabe Maxsted2010-11-12130-483/+559
|\ \ \ \
| * | | | llstring.h directly depends on #include <map>.Jacek Antonelli2010-11-091-0/+1
| |/ / /
| * | | IMP-692: SNOW-713: Merge branch 'weekly' into SNOW-713Aleric Inglewood2010-11-092-24/+23
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/newview/viewer_manifest.py Trivial proximity collision. Resolved.
| * \ \ \ Merge remote branch 'robin/SNOW-713' into SNOW-713Aleric Inglewood2010-11-071-7/+4
| |\ \ \ \
| | * | | | As we currently do not build the gstreamer plugin for windows, do not try to ↵Robin Cornelius2010-11-071-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | stage it in viewer_manifest.py
| | * | | | Correctly stage libhunspell.dll in viewer_manifest.pyRobin Cornelius2010-11-071-1/+3
| | | | | |
| * | | | | IMP-692: SNOW-713: Removed isHexString again, since it is not defined anywhere.Aleric Inglewood2010-11-071-2/+0
| |/ / / /
| * | | | IMP-692: SNOW-713: Fixed compile bug fixes.Aleric Inglewood2010-11-078-17/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: * Added changes from snowglobe 1.5 to indra/llcommon/llstring.h (compile errors as a result of a missing include, but I copied everything else too). * Added #include "linden_common.h" to emeraldboobutils.cpp. Really it's one the header files that needed that, but that's how this header works: every source file should include it as first header anyway, then there is no need for other headers to do that. * Renamed LLPanelRegionOpenSettingsInfo::sendUpdate(void*) to LLPanelRegionOpenSettingsInfo::onClickOrs because it was hiding a virtual function (BOOL sendUpdate(void)). * Made cutToClipboard more equal to copyToClipboard (was also hiding a virtual function). * Install libllcommon.so in lib64 on Linux_x86_64, instead of lib.
| * | | | IMP-692: SNOW-713: Global objects in libllcommon duplicated in pluginsAleric Inglewood2010-11-07124-469/+527
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://jira.secondlife.com/browse/SNOW-713 This patch makes llcommon shared. It contains the following snowglobe (SVN) changesets: 3478, 3479, 3480, 3481, 3482, 3485, 3496, 3498, 3500, 3519 and 3531, plus the fix for all rejects. Note that changes to scripts/automated_build_scripts/opensrc-build.sh (changesets 3500 and 3625) were ignored as we don't have scripts/automated_build_scripts.
* | | | | Merge remote branch 'thickbrick/weekly' into weeklyMcCabe Maxsted2010-11-121-7/+2
|\ \ \ \ \
| * | | | | Partial fix #614: wrong calculation of thread run timethickbrick2010-11-131-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gFrameIntervalSeconds instead of gFrameTimeSeconds - which is what the original author tried to do. Also, clean up some dead code. *However*, there is still the issue of texture fetch workers staying alive after finishing partial fetches, which falsly manifests here as pending work.
* | | | | | Merge remote branch 'thickbrick/weekly' into weeklyMcCabe Maxsted2010-11-115-573/+53
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | More #700: remove llfloaterhtmlhelp.cppthickbrick2010-11-101-562/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This file is media plugin a merge leftover. It was renamed to llfloatermediabrowser.cpp, but somehow this got left behind.
| * | | | Fix #700: View -> Web Browser does nothingthickbrick2010-11-103-6/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also made the "Home" and "Set Home" buttons work. "Send current URL to parcel" is still broken in SL, since it relies on the ParcelNavigateMedia capability which was never implemented by LL.
| * | | | Fix #699: Can't drag prims with translate manipulatorthickbrick2010-11-101-5/+6
| | |_|/ | |/| |
* | | | Added missing 'Plugin' entry in logcontrol.xmlMcCabe Maxsted2010-11-101-0/+1
| | | |
* | | | Merge remote branch 'aleric/weekly' into weeklyMcCabe Maxsted2010-11-093-2/+16
|\ \ \ \ | |/ / /
| * | | Install unstripped binary in packaged when --type=DebugAleric Inglewood2010-11-093-2/+16
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | This only affects linux. When one compiles the viewer with --type=Debug you want to be able to actually debug it, so you need debug symbols in the binary. Until now I manually copied imprudence-bin over the installed bin/do-not-directly-run-imprudence-bin, but this seems a more convient solution ;)
* | | fix: add missing AllowEditingOfTrees settingArmin Weatherwax2010-11-091-0/+12
| | |
* | | fix: add missing settings for logging into Aurora SimArmin Weatherwax2010-11-091-1/+37
| | |
* | | feature: add a tiny context menu to areasearch scroll list itemsArmin Weatherwax2010-11-095-0/+192
|/ / | | | | | | rightclick one of the results and teleport or cam to the object or bring it in edit mode
* | As we currently do not build the gstreamer plugin for windows, do not try to ↵Robin Cornelius2010-11-081-6/+1
| | | | | | | | stage it in viewer_manifest.py
* | Correctly stage libhunspell.dll in viewer_manifest.pyRobin Cornelius2010-11-081-1/+3
| |
* | Ported media_plugin_webkit changes from Snowglobe2, which are identical to ↵McCabe Maxsted2010-11-071-2/+8
| | | | | | | | SL2.3. This includes a more stable version of llqtwebkit for Windows
* | Use the LGPL version of the quicktime media plugin. This allows us to use ↵McCabe Maxsted2010-11-071-22/+15
|/ | | | quicktime without violating the GPL
* IMP-688: ERROR: getString: Invalid string control nick01Aleric Inglewood2010-11-062-1/+2
| | | | Don't look for the old variable names, "nick0*", but for the new ones.
* 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