aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'viewerinfo' into nextJacek Antonelli2011-05-2537-423/+562
|\
| * Removed viewerversion.xml, since it's not used anymore.Jacek Antonelli2011-05-252-27/+0
| |
| * Ported Mac packaging system from Kokua.Jacek Antonelli2011-05-216-91/+218
| | | | | | | | 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-201-31/+42
| | | | | | | | Run "make package" in the build directory to create a tarball.
| * Ported viewerinfo.cpp from Kokua.Jacek Antonelli2011-05-1912-272/+300
| | | | | | | | | | | | | | | | | | | | 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-2545-2132/+2719
|\ \
| * | 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
| | |
| * | 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-2212-330/+523
|\ \ \ \
| * | | | 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-171-0/+7
| | | | |
| * | | | 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
| | | | |
| * | | | Don't crash at the attempt to import clothing/bodyparts in file > import objectArmin Weatherwax2011-05-171-3/+17
| | | | |
| * | | | escape special characters in settings.xmlArmin Weatherwax2011-05-171-15/+15
| |/ / /
* | | | Merge remote-tracking branch 'thickbrick/remerge_772' into nextJacek Antonelli2011-05-224-16/+45
|\ \ \ \ | |_|_|/ |/| | |
| * | | Refix #772: Rebuild all volumes that use a sculpt image when that image has ↵thickbrick2011-05-134-16/+45
| |/ / | | | | | | | | | | | | | | | more data Previous fix was lost in merge of 8431725c0bf08da2b909cefe2f3ecfb43a2aecad
* | | Merge branch '1.3-maint' into nextJacek Antonelli2011-05-181-4/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/llcommon/CMakeLists.txt linden/indra/newview/llvoavatar.cpp linden/indra/newview/viewer_manifest.py
| * | | Linux64 fix linking and packaging of the new ogg/vorbis libsArmin Weatherwax2011-05-171-3/+4
| | | |
| * | | fix llerrs crash "Vertex buffer destroyed while mapped!"Armin Weatherwax2011-05-171-1/+1
| | | |
| * | | Bumped version to 1.3.2.Jacek Antonelli2011-05-144-8/+8
| | | |
| * | | Package both libz.so.1 and libz.so (symlink) on Linux32. (IMP-790)Jacek Antonelli2011-05-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The viewer binary links against libz.so, but libvivoxsdk.so and some other libraries link against libz.so.1. (cherry picked from commit 74d6849a9730941839f00c1ec2b640958fd61cc9)
| * | | VWR-25479: Avatar physics causing broken shapes on other viewers.Jacek Antonelli2011-05-131-7/+1
| | | | | | | | | | | | | | | | Patch by Seraph Linden.
| * | | Fixed vivox license appearing on other grids rather than specifically on ↵McCabe Maxsted2011-05-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | second life login when voice is enabled. (Partial cherry pick from commit a0902a050cc713f742990a09d2a610d4c135b7c7)
| * | | Fixed the Vivox license prompt appearing when connecting to non-SL grids on ↵McCabe Maxsted2011-05-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | startup (cherry picked from commit cea604cda04d783b989498055102674170864b5c)
| * | | fix: voice always on, even if told not to beArmin Weatherwax2011-05-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | introduced by 56bf45f >_> (cherry picked from commit 8f92d7925f2ba9259a6597c80584b09e023902da)
| * | | fix voice doesn't kick in.Armin Weatherwax2011-05-131-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | also fixed some LL_INFOS that should be LL_WARNS in the voice client. (cherry picked from commit 56bf45f3493689b5eb60cf99580adf11d6b02508)
* | | | Changed the cache and settings file names back to non-Experimental.Jacek Antonelli2011-05-181-1/+1
| |/ / |/| | | | | | | | This effectively reverts commits 20216aa7 and 3609adb5.
* | | Bumped version to 1.4.0 beta 1.Jacek Antonelli2011-05-084-10/+10
| | |
* | | Merged Experimental branch (exp) back into main line (next).Jacek Antonelli2011-05-08809-13226/+138981
|\ \ \ | |/ / |/| / | |/ | | | | | | | | Git thought many files (almost 100) had merge conflicts. But, after resolving the conflicts (which were mostly trivial), almost all the files turned out to be the same as in the exp branch. So, the conflicts are not listed here. Check the diff between commit 244ffe8 and this commit to see what really changed.
| * Changed version to Experimental 2011.04.19McCabe Maxsted2011-04-191-1/+1
| |
| * Fixed a compile error (and what I assume to be a source error) in 9cb3d883McCabe Maxsted2011-04-191-1/+1
| |
| * fix some flaws in the cloud particle prefsArmin Weatherwax2011-04-198-36/+70
| |
| * add some basic cloud preferences in prefs > advanced >eye candy - please ↵Armin Weatherwax2011-04-198-9/+212
| | | | | | | | review perms
| * Added missing NULL check for gAudiostream in chatbar_as_cmdlineMcCabe Maxsted2011-04-191-1/+4
| |
| * Applied fix for crash when item just added to the inventory is renamed, ↵McCabe Maxsted2011-04-192-4/+10
| | | | | | | | ported from Phoenix, patch by Henri Beauchamp and Ansariel Hiller
| * Modified tag color setting to change the color for all Imprudence tags the ↵McCabe Maxsted2011-04-191-181/+197
| | | | | | | | client sees. Hardcoded colors are now used for Imp
| * Merge remote-tracking branch 'armin/exp' into expMcCabe Maxsted2011-04-199-23/+330
| |\
| | * workaround crash seemingly specific for win7/64 on AuroraArmin Weatherwax2011-04-171-1/+7
| | | | | | | | | | | | todo: find out and fix why internal_time gets 0
| | * Add HeadFollowsMouse debugsetting + UI in preferences > advanced. Defaults ↵Armin Weatherwax2011-04-153-8/+34
| | | | | | | | | | | | | | | | | | | | | to *false* if false own avatars head doesn't follow the mouse no matter to what PitchFromMousePosition and YawFromMousePosition are set.
| | * linux: several improvements to the starter script, provide a default alsoft.confArmin Weatherwax2011-04-123-12/+287
| | | | | | | | | | | | | | | | | | | | | * removed several export lines that are not supported * added a line that -if the user enables it- lets openal load a specific alsoft.conf * added a line that -if the user enables it- adds a custom GST_PLUGIN_PATH * create a crashlog package in the viewer folder if stack_trace.log exists.
| | * diamonds are a gccs best friend ... and need also a spaceArmin Weatherwax2011-04-122-2/+2
| | |
| * | Added custom nametag coloring for Imprudence tags (local only)McCabe Maxsted2011-04-195-7/+39
| | |
| * | Fixed bug in moving reset prefs to the main prefs window (didn't show the ↵McCabe Maxsted2011-04-191-0/+2
| | | | | | | | | | | | notification)
| * | Remember name and password based on grid. This is far from optimal, but will ↵McCabe Maxsted2011-04-1914-350/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | work for the time being. * UI needs to be made clear on what's going on with user's passwords * 'Remember password' checkbox now works on login (but is unclear) * Stored passwords are MD5s in grid_info.xml * Fixed vivox license appearing on other grids rather than specifically on second life login when voice is enabled * Small fix for username entry after logout * Sadly, storing password in the mac keychain needs to be reimplemented now