aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge remote-tracking branch 'armin/inventory-cap' into nextMcCabe Maxsted2012-02-186-32/+210
| |\
| | * fix 3 possible memleaks in the new inventory codeArmin Weatherwax2012-01-202-13/+28
| | |
| | * Followup of the last commit (also Henri Beauchamp)Armin Weatherwax2012-01-111-1/+1
| | |
| | * New inventory categrory capability code - needs testing.Armin Weatherwax2012-01-106-29/+192
| | | | | | | | | | | | | | | | | | * Original code from: https://bitbucket.org/lindenlab/viewer-development/changeset/d327dcc8ae51 * Port by Henri Beauchamp: https://lists.secondlife.com/pipermail/opensource-dev/2012-January/008544.html * 3 Lines of debug by /me (find the Hippos -remove after testing)
| * | Merge remote-tracking branch 'armin/next' into nextMcCabe Maxsted2012-02-1816-104/+150
| |\ \ | | |/
| | * disable voice if ParcelVoiceInfoRequest response is malformed.Armin Weatherwax2011-12-251-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seen (empty LLSD) in OSGrid Mumble Sandbox. Without a "voice_credentials" key the client never connects to the server, but would retry in vain to do so. Note to OpenSim devs: the "channel_uri" of the ParcelVoiceInfoRequest response is parsed to identify if we are connecting to a mumble server on parcel change. The presence of "sip:" within the uri is interpreted as connecting to vivox/freeswitch, the absence as connecting to a mumble server. However it would be much better to add a "server_type" key to the response, which could hold a string like "mumble", "freeswitch", etc - the absence would indicate connecting to a legacy(like) voice server. Additional note: to detect a mumble server also of the VoiceAccountProvision response the voice_account_server_uri is parsed: If the uri starts with tcp:// the "mumble" client is loaded(by default, you can change it in the "VoiceModuleMumble" debug setting), for any other scheme "SLVoice" (default, "VoiceModuleVivox" debug setting).
| * | Fixed tons of 'LLXMLTree invalid token' warnings spamming the log and made ↵McCabe Maxsted2012-02-171-8/+31
| | | | | | | | | | | | the warnings we show less confusing
| * | Re-commented out Inventory loggingMcCabe Maxsted2012-02-171-1/+1
| | |
* | | Support the new WindlightReset message from OpenSim for resetting Windlight ↵David Walter Seikel2011-12-293-5/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | presets when leaving a sim that uses Lightshare. Note, this windlight and lighthshare stuff needs a refactoring. The (I think LL inspired) Windlight CAPS duplicates a lot of this code. Still should backup any WL changes that have not been stored in a preset to. Some cleanup to do as well. That's why there is some excess cruft added with this commit, part way through implementing some of the above.
* | | Even I did not notice these icons where missing. lolDavid Walter Seikel2011-12-214-0/+0
| | |
* | | Smarten up my smart arse comment. lolDavid Walter Seikel2011-12-051-3/+1
| | |
* | | Merge branch 'next' of git://github.com/ArminW/imprudence into nextDavid Walter Seikel2011-12-0516-122/+138
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: linden/indra/newview/viewer_manifest.py Conflicted with the OTR stuff, simple fix.
| * | Linux: allow cross compiling the 32bit viewer on a x86_64 platformArmin Weatherwax2011-11-133-6/+49
| | | | | | | | | | | | | | | | | | | | | | | | to do so: (have anything for crosscompiling installed), export WORD_SIZE='32' before configuring and/or building. Be aware: Mixing several platforms in one root directory probably wont work (didn't try though). Cross compiling the 64bit viewer on a i686 platform isn't tested, but probably will work using export WORD_SIZE='64'
| * | use qt/webkit 4.7.4 on linuxArmin Weatherwax2011-11-135-53/+32
| | |
| * | Linux: remove libxml2 dependency.Armin Weatherwax2011-11-132-9/+16
| | | | | | | | | | | | | | | This might also be possible on other platforms, the newer your gstreamer is, the easier to get rid of libxml2.
| * | Linux: update OpenAL to 1.13.0Armin Weatherwax2011-11-132-12/+17
| | | | | | | | | | | | | | | for Linux64 the 32bit compatibility libs (32bit openal et al.) are now integrated into the openal package.
| * | improve the voiceclient shutdown a bitArmin Weatherwax2011-11-131-5/+14
| | |
| * | Linux64: don't use -ffast-math for release builds, it didn't do anything for us.Armin Weatherwax2011-11-131-1/+2
| | | | | | | | | | | | But lloctree crashes teleporting to mega regions using -ffast-math .
| * | 2 fixes in llxmlnode: pass LLUUID& instead of LLUUID to setUUIDValue; remove ↵Armin Weatherwax2011-11-132-5/+2
| | | | | | | | | | | | superfluous NULL pointer check
| * | fix pass LLSD& instead LLSD to selectByValueArmin Weatherwax2011-11-132-4/+4
| | |
| * | fix Bug #967 memleak in llfloaterregioninfoArmin Weatherwax2011-11-131-9/+2
| | |
* | | Revert "Another possible fix for misplaced HUDs?"David Walter Seikel2011-12-033-40/+5
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a1f82acebab97347d49a941f67a6df0ce78c29a6. It screws with TPs, and does not seem to help anyway. Note that this is really a server bug we keep trying to work around in the viewer. We really should just fix the damn server. It's the server that keeps things laying around in it's cache that are no longer there, then sending them to the viewer and confusing it.
* | | Remove more of the "set your own tag colour" stuff.David Walter Seikel2011-12-035-53/+7
| | | | | | | | | | | | I think this is right.
* | | Merge branch 'next' of git://github.com/imprudence/imprudence into nextDavid Walter Seikel2011-12-03219-729/+13331
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the new "Set your own Imprudence tag colour feature". Should check though, might be bits left that where not obvious. Conflicts: .gitignore linden/indra/cmake/00-Common.cmake linden/indra/newview/llvoavatar.cpp linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/xui/en-us/panel_login.xml linden/indra/newview/viewer_manifest.py linden/indra/newview/viewerinfo.cpp The usual branding conflicts.
| * | Made the voice license window resizableMcCabe Maxsted2011-10-171-7/+7
| | |
| * | Always enable the vivox license checkbox, as it sometimes doesn't enable ↵McCabe Maxsted2011-10-171-9/+3
| | | | | | | | | | | | when the license loads
| * | Fixed vivox license appearing when enabling voice on opensimMcCabe Maxsted2011-10-174-10/+29
| | |
| * | Check to make sure the version of cElementTree is really compatible with the ↵McCabe Maxsted2011-10-171-0/+1
| | | | | | | | | | | | version of python we expect
| * | Fixed username text field max being too small to enter some namesMcCabe Maxsted2011-09-271-1/+1
| |/
| * Changed version to 1.4.0 beta 2McCabe Maxsted2011-09-232-5/+5
| |
| * Removing old mozilla fileMcCabe Maxsted2011-09-231-0/+0
| |
| * Fixed missing 'nl' translation (from SL 1.23.5)McCabe Maxsted2011-09-23178-0/+12208
| |
| * Fixed packaging script not finding the right .exe for a congigurationMcCabe Maxsted2011-09-231-1/+11
| |
| * Fixed the script editor constantly searching for an update that doesn't ↵McCabe Maxsted2011-09-132-47/+78
| | | | | | | | exist (also some more cleanup)
| * Ported external script editor patch from Phoenix, added some cleanup, and ↵McCabe Maxsted2011-09-137-12/+341
| | | | | | | | made it use menus (also added autosave and fixed the 'reset' button alignment being off while I was there)
| * Don't run vstool.exe when using an express version of vc++, by CobraElDiablo ↵McCabe Maxsted2011-09-082-12/+18
| | | | | | | | from the Astra Viewer
| * Revert "Reverted ability to customize the Imprudence client tag color."McCabe Maxsted2011-09-085-182/+256
| | | | | | | | This reverts commit 87219855c664447a39dd7c2d8866f0a630d1c843.
| * Backout of the sculptie derender patch ported from FireStormMcCabe Maxsted2011-09-087-64/+2
| | | | | | | | This also reverts 14f4622c and 534767ef
| * Fixed snapshot Capture comboMcCabe Maxsted2011-09-081-4/+4
| |
| * Create readable version string for installers, based on jacek's ↵McCabe Maxsted2011-09-081-1/+8
| | | | | | | | viewer_info.py script
| * Updated develop.py to find VS2010 as well (patch by DJ Wind)McCabe Maxsted2011-09-081-3/+3
| |
| * Removed old unused stable installer script. Still need to figure out a good ↵McCabe Maxsted2011-09-081-374/+0
| | | | | | | | way of determining if a build's experimental
| * Fixed llkdu .config file not being copied during packagingMcCabe Maxsted2011-09-081-0/+3
| |
| * Fixed merge errors in the windows installer script templateMcCabe Maxsted2011-09-081-5/+6
| |
| * Get the default version from viewerinfo.cpp in the build systemMcCabe Maxsted2011-09-081-11/+9
| |
| * Fixed windows packaging merge errorsMcCabe Maxsted2011-09-082-8/+11
| |
| * Rebranded the Windows isntaller template back to ImpMcCabe Maxsted2011-09-082-40/+52
| |
| * Fixed cmake merge error when adding SSE2 target to copy win libsMcCabe Maxsted2011-09-081-27/+26
| |
| * Added a new Windows installer script for ISS. Packaging now just generates a ↵McCabe Maxsted2011-09-083-155/+418
| | | | | | | | versioned script that must be compiled (currently) by hand. Leaving the NSIS files to be cleaned up as the installer work continues
| * Removed packaging private assemblies since that's no longer how we ↵McCabe Maxsted2011-09-081-21/+12
| | | | | | | | distribute the CRT
generated by cgit v1.1 at 2025-04-03 12:46:25 +0000