aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Default Lightshare to being on.David Seikel2011-06-091-1/+1
|
* Trying to use the new package thingy, did not work.David Seikel2011-06-061-0/+100
| | | | I need to study what they did more closely. At least the script itself is here, to remind me to fix it. lol
* First hack at fixing up http://onefang.net/redmine/issues/41 .David Seikel2011-06-064-10/+10
| | | | Definately needs more work at a deeper level.
* Sort grids in alphabetical order. Removed some, added others.David Seikel2011-06-061-131/+116
| | | | | | Removed LL grids, this viewer is not compliant with their policy. Removed OSGrid, they seem bent on banning users for no good reason. Added others that are where meta-impy users are likely to be hanging out.
* Looks like the reason so called "linden" trees are so ugly is coz LL ↵David Seikel2011-06-061-1/+1
| | | | | | unreasonably limited their LODfactor. 12 is pretty much "almost too far away to see", so is a reasonable upper limit.
* One more genericism.David Seikel2011-06-061-2/+2
|
* Comment out the packaging stuff again, upstream made something better. I ↵David Seikel2011-06-061-21/+22
| | | | think. lol
* Settings.xml is not really diff friendly. Patch up some, changes others ↵David Seikel2011-06-061-44/+33
| | | | that I have reconsidered, fix up some actual problems.
* Changing the deruth log messages to warns, coz they really are.David Seikel2011-06-061-3/+3
| | | | Plus, meta-impy default log level is warn, and we want to see them.
* Merge branch 'next' of git://github.com/jacek/imprudence into nextDavid Seikel2011-06-04281-4102/+14212
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts (manually merged): linden/indra/llcommon/llversionviewer.h linden/indra/llvfs/lldir.cpp linden/indra/llvfs/lldir_mac.cpp linden/indra/newview/CMakeLists.txt linden/indra/newview/English.lproj/InfoPlist.strings linden/indra/newview/Info-Imprudence.plist linden/indra/newview/Info-meta-impy.plist linden/indra/newview/llappviewer.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/packaging/mac/Info.plist.in linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml linden/indra/newview/skins/default/xui/zh/menu_viewer.xml linden/indra/newview/skins/default/xui/zh/panel_group_general.xml linden/indra/newview/viewer_manifest.py linden/indra/newview/viewerversion.cpp linden/indra/newview/viewerversion.h linden/install.xml Also some post merge tweaks.
| * Fixing the menu to actually use its color options reveals how broken the ↵McCabe Maxsted2011-06-025-24/+14
| | | | | | | | | | | | | | | | | | whole system is. In this case, fixing the viewer menu color breaks the login menu bar. Seems like a better breakage alternative for the beta, though (cherry picked from commit 084bd7a120e9ac122e4356246a1da57fd8f1204e)
| * Fixed #875 by removing menu border introduced in 84ba6c13McCabe Maxsted2011-06-028-79/+74
| | | | | | | | (cherry picked from commit bcfe397d0f3ab2bd8df3f8055f089824dd082bf4)
| * Fix for #903 ATI star issue, ported from Phoenix via Shoytl and SingularityMcCabe Maxsted2011-06-022-10/+11
| | | | | | | | (cherry picked from commit 7d6337fb7683546c17c922aa1b0f7e3ca5982448)
| * Merge remote-tracking branch 'Kakurady/translation-zh-pub' into nextJacek Antonelli2011-06-02142-842/+6022
| |\
| | * Minor improvements in interface textKakurady2011-06-015-80/+80
| | | | | | | | | | | | Mostly, use of unicode symbols instead of ASCII approximations
| | * Translated all XUI text added in Imprudence after 1.23 into Chinese.Kakurady2011-06-01138-762/+5942
| | | | | | | | | | | | Almost all, anyway. Also patched up items in English version that were not translatable because of missing XUI attributes.
| * | Merge remote-tracking branch 'armin/morevoice' into nextJacek Antonelli2011-06-023-54/+75
| |\ \ | | |/ | |/|
| | * fix an edge case when voice didn't kick in; fix reconnect to voice not workingArmin Weatherwax2011-06-013-54/+75
| |/
| * Replaced the labels in the web browser window with icons based on those in ↵McCabe Maxsted2011-05-275-35/+27
| | | | | | | | the Open Icon Library (http://openiconlibrary.sourceforge.net)
| * Added URL parsing to group notice history messagesMcCabe Maxsted2011-05-271-1/+7
| |
| * Fixed avatar profile and group charters not displaying in searchMcCabe Maxsted2011-05-272-0/+4
| |
| * Made LLTextEditor::clear() actually clear the contents of the textbox rather ↵McCabe Maxsted2011-05-271-0/+6
| | | | | | | | than just replace unstyled text
| * Auto-deRuth code, by way of Siana Gearz and the Phoenix viewer.Aidan Thornton2011-05-272-1/+55
| | | | | | | | | | [ From Tonya Souther's 672:143c811ee5e2 and 688:1900969ebf65 in phoenix-sg ] (cherry picked from commit d3ffe737a82e4bf54ce1413efeb7e92f43dfccca)
| * Don't show [CHANNEL] on the login panel, it's not used anymore.Jacek Antonelli2011-05-271-1/+1
| |
| * Merge branch 'texturepicker' into nextJacek Antonelli2011-05-263-2/+6
| |\
| | * Disabled the texture_picker in "Local Texture Properties". (IMP-476)Jacek Antonelli2011-05-262-2/+2
| | | | | | | | | | | | | | | | | | Before, the texture_picker widget in the "Local Texture Properties" floater was interactive, even though using it had no effect. Now it is disabled (noninteractive), to avoid misleading or confusing the user.
| | * Better behavior for disabled texture_picker (LLTextureCtrl) widgets.Jacek Antonelli2011-05-261-0/+4
| |/ | | | | | | | | | | Before, a disabled texture_picker widget would still open a floater when clicked, change the mouse cursor on hover, and accept drag-and-drops. Now, it actually behaves in a disabled way.
| * Fixed Linux viewer_manifest.py not running after each build.Jacek Antonelli2011-05-261-0/+1
| |
| * Merge branch 'viewerinfo' into nextJacek Antonelli2011-05-2545-510/+1066
| |\
| | * Removed viewerversion.xml, since it's not used anymore.Jacek Antonelli2011-05-252-27/+0
| | |
| | * Coax Xcode into selecting the right build type by default.Jacek Antonelli2011-05-211-3/+6
| | | | | | | | | | | | | | | | | | This is accomplished by dynamically reordering the CMake variable CMAKE_CONFIGURATION_TYPES so that the current build type (the value of CMAKE_BUILD_TYPE) is listed first.
| | * Ported Mac packaging system from Kokua.Jacek Antonelli2011-05-218-99/+222
| | | | | | | | | | | | Build the "package" target in Xcode to create a DMG.
| | * Moved Mac packaging files to newview/packaging/mac.Jacek Antonelli2011-05-2122-7/+7
| | |
| | * Ported Linux packaging system from Kokua.Jacek Antonelli2011-05-203-31/+412
| | | | | | | | | | | | Run "make package" in the build directory to create a tarball.
| | * Ported viewer_info.py and BuildVersion.cmake from Kokua.Jacek Antonelli2011-05-193-67/+121
| | | | | | | | | | | | | | | | | | | | | viewer_info.py provides a way to easily query the viewer name and version (from viewerinfo.cpp). It replaces build_version.py, which has been removed. BuildVersion.cmake has been updated to use viewer_info.py instead of build_version.py.
| | * Ported viewerinfo.cpp from Kokua.Jacek Antonelli2011-05-1913-286/+308
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It defines the ViewerInfo module/namespace, which contains a variety of functions for querying the viewer name and version. It is designed to be a replacement for viewerversion.cpp and viewerversion.xml. viewerversion.cpp has been removed, but viewerversion.xml remains (albeit with a bogus version number) until the packaging system no longer uses it.
| * | Merge remote-tracking branch 'mccabe/1.4.0-fbeta-prefs_reorg' into nextJacek Antonelli2011-05-2546-2132/+2723
| |\ \
| | * | Besides the numerous label and organizational changes, here are the main pointsMcCabe Maxsted2011-05-0442-2130/+2711
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moved numerous options out of the Advanced panel * Moved numerous options out of the General panel * Combined the Network and Web Browser panels * Combined IM, Chat, and Spell checking preferences * Combined 'Show timestamps in IMs' and 'Show timestamps in Local Chat' to one ShowTimestamps setting * Removed UI for 'hide my own group title'. This can still be set in the debug settings * Renamed Popups > Notifications * Renamed Chat Colors > Colors * Renamed 'IMs and Logging' to 'Logging and Privacy' * Moved Colors next to Skins * Added style guide to the top of every preferences panel xui
| | * | Backported crash fix in llhudeffectlookat from gpl'd viewer 2McCabe Maxsted2011-04-262-0/+6
| | | |
| | * | Added DirectX SDKs june 2010 and march 2009 to cmakeMcCabe Maxsted2011-04-261-0/+4
| | | |
| | * | Updated windows installer versionMcCabe Maxsted2011-04-191-2/+2
| | | |
| * | | Merge remote-tracking branch 'thickbrick/remove_buggy_http_workaround' into nextJacek Antonelli2011-05-222-55/+2
| |\ \ \
| | * | | Remove workaround for http texture ranges on Opensimthickbrick2011-05-132-55/+2
| | | | | | | | | | | | | | | | | | | | | | | | | The various http textures request range bugs are fixed in Opensim 0.7.1. Also, this workaround was ugly, hacky and buggy.
| * | | | Merge remote-tracking branch 'armin/misc' into nextJacek Antonelli2011-05-2221-364/+652
| |\ \ \ \
| | * | | | revamp the voice client.Armin Weatherwax2011-05-226-309/+474
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * split the "voice" debug tag into several tags for usable filtering while debugging * remove debug-spam from user view by: * remove capability request spam by: * llstartup the voice client state engine when actually a region is present, and not the initial fake region. * don't request a capability to determine if (the very same) capability can be requested. * don't do it over and over as if a capability rezzed in like an avatar. Its available - or not (see llstartup). * unload the daemon if not used. * load vivox daemon depending on specific criteria in the caps * remove the partial implementation to load a specific daemon with via the openregion message or the login response. * discard obsolete caps. Tested and working on linux: Parcel changing, region changing, (SL) voice-disabled region private call, (SL) private call region changing, (OS) no voice <-> voice region changing, (OS) mumble <-> freeswitch region changing. To test: Mac, Win. Anything that needs to be tested and not mentioned above.
| | * | | | Add missing debug about stopping internet stream.Armin Weatherwax2011-05-171-1/+1
| | | | | |
| | * | | | show plugin debug messages also on windowsArmin Weatherwax2011-05-175-1/+83
| | | | | |
| | * | | | fix bug #879 context menu of line + text editors triggers select all even if ↵Armin Weatherwax2011-05-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | not asked to
| | * | | | fix Bug #880 gridmanager defaults render_compat true instead of false.Armin Weatherwax2011-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | are there any render_compat grids anyway?
| | * | | | fix default unloaded avatar cloud particle texture not loadingArmin Weatherwax2011-05-172-1/+8
| | | | | |