aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmessage (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'imprudence/next' into nextDavid Walter Seikel2013-08-302-9/+62
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unless otherwise stated, Imprudence changes accepted. The three images seem to be the same. Conflicts: .gitignore linden/indra/develop.py linden/indra/llcommon/llsdserialize_xml.cpp linden/indra/newview/CMakeLists.txt Manually combined MOAP, OTR, and WL changes from both. linden/indra/newview/app_settings/default_grids.xml Manually merged the grid collection. Also updated IG info. linden/indra/newview/hippoupdate.cpp linden/indra/newview/llettherebelight.cpp Just used the Imprudence copy. linden/indra/newview/llviewermessage.cpp Keep unbranding. linden/indra/newview/llvoavatar.cpp Manually merge client tags. linden/indra/newview/res/viewerRes.rc Manually merge version from Impy. linden/indra/newview/skins/dark/colors_base.xml Keep unbranding. linden/indra/newview/skins/default/html/unabletoconnect.png linden/indra/newview/skins/default/textures/icon_top_pick.tga linden/indra/newview/skins/default/xui/en-us/floater_about.xml Manual merging of contributors. linden/indra/newview/skins/gemini/colors_base.xml Keep unbranding. linden/indra/newview/skins/gemini/textures/icon_top_pick.tga linden/indra/newview/viewer_manifest.py Manually merged boost, gstreamer, OTR, and name. linden/indra/newview/viewerinfo.cpp Manually merge the comment.
| * Clean up some compiler warnings. More to come.David Walter Seikel2013-04-061-1/+2
| |
| * Remove a duplicate return statement. Thanks to Nicky Perian for pointing ↵David Walter Seikel2012-03-201-1/+0
| | | | | | | | this out.
| * Fix http://redmine.kokuaviewer.org/issues/1126 and as a bonus, now using ↵David Walter Seikel2012-03-111-8/+61
| | | | | | | | blowfish to encrypt passwords.
* | Merge branch 'next' of git://github.com/jacek/imprudence into nextDavid Seikel2011-06-041-1/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Merge branch '1.3-maint' into nextJacek Antonelli2011-05-181-1/+9
| |\ | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/llcommon/CMakeLists.txt linden/indra/newview/llvoavatar.cpp linden/indra/newview/viewer_manifest.py
| | * also link with ld.goldArmin Weatherwax2011-05-171-1/+9
| | | | | | | | | | | | thanks to Aleric and Siana for the idea
| | * Potential fix for #447: llSetText text shows characters as invalidMcCabe Maxsted2010-08-261-1/+1
| | |
* | | Merge branch 'libotr' into expDavid Seikel2011-05-123-51/+51
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/llmessage/message.cpp linden/indra/newview/llprefsadvanced.cpp
| * | | Windows build changes, maybe only needed for vc2005. Mostly snprintf -> ↵Chris Tuchs2011-05-083-51/+51
| | | | | | | | | | | | | | | | ll_snprintf, namespace hacks confused vc2005
* | | | Merge remote-tracking branch 'imprudence/exp' into expDavid Seikel2011-04-2610-11/+731
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | | | | Conflicts (for future reference): linden/indra/llcommon/llstring.cpp linden/indra/newview/llpanelnetwork.cpp linden/indra/newview/llselectmgr.cpp linden/indra/newview/llstartup.cpp linden/indra/newview/lltoolmgr.cpp linden/indra/newview/llvoavatar.cpp
| * | Ported SOCKS5 proxy support from Snowglobe 1.5McCabe Maxsted2011-04-1210-11/+731
| | |
* | | Merge remote-tracking branch 'jacek/exp' into expDavid Seikel2011-04-031-14/+14
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore linden/indra/newview/English.lproj/InfoPlist.strings linden/indra/newview/llpanellogin.cpp linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/xui/en-us/panel_login.xml linden/install.xml Mostly went with my originals, manually merged llpaterrogin.cpp and panel_login.xml.
| * | cleaned up particle system llsd de/serialization; improvements to the avatar ↵Armin Weatherwax2011-03-251-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | cloud * llsd now uses camel case for each key, confusion of particle max age vs source max age fixed * cloud.xml is now loaded with a fallback chain PER_SL_ACCOUNT -> USER_SETTINGS -> APP_SETTINGS so that customized clouds can exist per account or for all users and survive updates
* | | Merge remote-tracking branch 'mccabe/exp' into weeklyDavid Seikel2011-03-205-6/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: (Keeping these around as a record, there was some strangeness. .gitignore linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llfloaterregioninfo.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/skins/default/html/en-us/loading-error/index.html linden/indra/newview/skins/default/html/en-us/loading/loading.html linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/install.xml
| * | Fixed bad line endings (CRLF) in many files.Jacek Antonelli2011-03-183-9/+9
| | | | | | | | | | | | | | | Windows users, please set "autocrlf = input" or "autocrlf = true" in your .git/config [core] section to avoid this in the future.
| * | Merge in Var Sized Regions into the Imprudence Experimental.RevolutionSmythe2011-03-185-9/+16
| | |
* | | Unbranding word of the day is "Second Life".David Seikel2011-02-261-0/+1
| | |
* | | Unbranding. Todays word is "linden".David Seikel2011-02-258-9/+8
| | |
* | | Merge branch 'weekly' into brandingDavid Seikel2011-02-2019-219/+1182
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts (solved): linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llappviewerwin32.cpp
| * \ \ Merge remote-tracking branch 'mccabe/weekly' into weeklyDavid Seikel2011-02-2018-210/+1182
| |\ \ \ | | |/ /
| | * | Merge remote branch 'remotes/github/weekly' into weeklyMcCabe Maxsted2011-02-1812-210/+121
| | |\ \
| | | * | IMP-590: Added a thread-safe and robust wrapper for APR pools.Aleric Inglewood2010-11-1712-210/+121
| | | | | | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/590
| | * | | Add an UI for Display name settings to prefs general, make the setting more ↵Armin Weatherwax2011-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | intuitive instead: of 0 legacy only , 1 both and 2 display names only we use now: 0 legacy, 1 display names only and 2 both
| | * | | Henri Beauchamp: Display Names support v4Armin Weatherwax2011-01-244-0/+968
| | | | |
| | * | | load unloaded-avatar-cloud particle system from LLSD file.Armin Weatherwax2010-12-222-0/+93
| | |/ /
| * | | Remove special handling of linden estates. We don't have them in meta, and ↵David Seikel2011-02-101-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | that sort of policy should be server side anyway. It's good to remove useless code. As usual I found three ways of recognising linden estates being used in the code, makes it hard to find them all. Might be some left over.
| * | | For meta7 - while LL reserves the first 5 estate numbers for it's own use, ↵David Seikel2011-02-101-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we never did that here in meta7. This causes a problem, since LL based viewers react differently to those first 5 estates. In particular there are dire warnings and greyed out widgets in the estate access tools. In meta7 there are now 2 active estates with numbers in the 1 to 5 range that are just ordinary estates, but their owners can't unban residents. The server developers never gave me an answer about wether just renumbering the estates would cause any problems. So I'll fix this in the meta7 viewer. These sorts of things should be server side enforced policy anyway. This may break LL TPV, but meta7 does not care about some other grids policies.
* | | UNBRANDING! Conservativley remove references to "second life", replacing ↵David Seikel2011-02-131-1/+1
| | | | | | | | | | | | them with something generic.
* | | Revert "For meta7 - while LL reserves the first 5 estate numbers for it's ↵David Seikel2011-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | own use, we never did that here in meta7." This should have been in the weekly branch. This reverts commit 08dd8adc3d12abdca430b6a1ea9c570258b4e655.
* | | For meta7 - while LL reserves the first 5 estate numbers for it's own use, ↵David Seikel2011-02-081-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | we never did that here in meta7. This causes a problem, since LL based viewers react differently to those first 5 estates. In particular there are dire warnings and greyed out widgets in the estate access tools. In meta7 there are now 2 active estates with numbers in the 1 to 5 range that are just ordinary estates, but their owners can't unban residents. The server developers never gave me an answer about wether just renumbering the estates would cause any problems. So I'll fix this in the meta7 viewer. These sorts of things should be server side enforced policy anyway. This may break LL TPV, but meta7 does not care about some other grids policies.
* | IMP-692: SNOW-713: Global objects in libllcommon duplicated in pluginsAleric Inglewood2010-11-0713-33/+37
| | | | | | | | | | | | | | | | | | | | 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.
* | Merged webkit_plugins into weekly. Huzzah! The weekly branch now has ↵McCabe Maxsted2010-11-0211-0/+1164
|\ \ | | | | | | | | | browser/media plugin support
| * \ Merge branch 'mccabe-plugins' into plugins_mergeRobin Cornelius2010-10-1011-0/+1164
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | llmediaplugins first stepArmin Weatherwax2010-09-2311-0/+1164
| | | |
* | | | Fixed message builder files missing from CMakeMcCabe Maxsted2010-11-011-0/+2
| | | |
* | | | Merges the Message log and Message builder from Inertia in.RevolutionSmythe2010-11-019-19/+197
|/ / /
* | | SNOW-86: Dangerous macro leads to possible wrong codeAleric Inglewood2010-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/571 This patch appeared to already have been partially applied. I added more semi-colons after all llendl (and LLENDL) macros, and wrapped the lllog ... llendl construct into do { ... } while(0) as is usual for macros that mimic a single statement. The patch was double checked with regular expression greps and a compile.
* | | RED-556: SNOW-800: Massively duplicated objectsAleric Inglewood2010-10-013-260/+528
|/ / | | | | | | See http://redmine.imprudenceviewer.org/issues/556
* | Potential fix for #447: llSetText text shows characters as invalidMcCabe Maxsted2010-08-281-1/+1
|/
* Updated hipporestrequest code to hippo 0.6.3McCabe Maxsted2010-07-072-11/+14
|
* Fixed memory leak in llmessage/llhttpclient.cpp (backported from SL 2.0)McCabe Maxsted2010-06-261-0/+1
|
* Applied patch by Kirstenlee Cinquetti for SNOW-493: ↵McCabe Maxsted2010-06-191-57/+156
| | | | LLDataPackerBinaryBuffer::unpack*() check for buffer overflow, then read buffer regardless
* Updated patch to SNOW-492 (76937222) to Merov Linden's SNOW-492-2.patchMcCabe Maxsted2010-06-191-13/+17
|
* Rare crash fix from Hippo for payment dialog under lagMcCabe Maxsted2010-04-261-1/+5
|
* SNOW-492: LLDataPacker::unpackstring() is unsafe.Jacek Antonelli2010-02-181-5/+18
| | | | Patch by Robin Cornelius.
* Ported some asset storage changes from Snowglobe.Jacek Antonelli2010-02-162-22/+31
|
* Ported some cURL and HTTP-related changes from Snowglobe.Jacek Antonelli2010-02-083-16/+39
|
* Ported many APR changes from Snowglobe.Jacek Antonelli2010-02-081-1/+1
|
* Merge remote branch 'mccabe/1.3.0-next' into nextJacek Antonelli2009-11-19170-812/+2045
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/cmake/00-Common.cmake linden/indra/newview/skins/default/xui/de/floater_about.xml linden/indra/newview/skins/default/xui/fr/floater_about.xml linden/indra/newview/skins/default/xui/ja/floater_about.xml linden/indra/newview/skins/default/xui/ko/floater_about.xml linden/indra/newview/skins/default/xui/zh/floater_about.xml linden/install.xml
generated by cgit v1.1 at 2024-11-15 16:31:09 +0000