aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llrender (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'imprudence/next' into nextDavid Walter Seikel2013-08-303-8/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-063-8/+11
| |
* | Merge branch 'next' of git://github.com/jacek/imprudence into nextDavid Seikel2011-06-041-1/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Fix for #903 ATI star issue, ported from Phoenix via Shoytl and SingularityMcCabe Maxsted2011-06-021-1/+3
| | | | | | | | (cherry picked from commit 7d6337fb7683546c17c922aa1b0f7e3ca5982448)
* | Merge branch 'libotr' into expDavid Seikel2011-05-121-2/+2
|\ \ | | | | | | | | | | | | | | | Conflicts: linden/indra/llmessage/message.cpp linden/indra/newview/llprefsadvanced.cpp
| * | Windows build changes, maybe only needed for vc2005. Mostly snprintf -> ↵Chris Tuchs2011-05-081-2/+2
| | | | | | | | | | | | ll_snprintf, namespace hacks confused vc2005
* | | Merge remote-tracking branch 'imprudence/exp' into expDavid Seikel2011-04-261-22/+31
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | 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
| * Initialize local variables in llimagegl.cpp, from Singularity, patch by ShyotlMcCabe Maxsted2011-04-051-22/+31
| |
* | Merge remote-tracking branch 'jacek/exp' into expDavid Seikel2011-04-032-3/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | 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.
| * Added a new default font size FontSansSerifBigger and fixed FontSansSerifBig ↵McCabe Maxsted2011-03-242-3/+11
| | | | | | | | not being named FontSansSerifLarge
* | Unbranding. Todays word is "linden".David Seikel2011-02-251-1/+1
|/
* IMP-692: SNOW-713: Global objects in libllcommon duplicated in pluginsAleric Inglewood2010-11-072-2/+1
| | | | | | | | | | 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.
* Added FontSizeMultiplier and FontSizeRounding settings.Jacek Antonelli2010-10-221-1/+9
| | | | | Gives more control over font sizes, addresses font being smaller than some users desire.
* Fix some STL errors highlighted by MSVC debugRobin Cornelius2010-10-091-1/+1
|
* Use integer font sizes to avoid blurriness on some systems.Jacek Antonelli2010-10-081-2/+3
|
* 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.
* Applied patch by Aleric Inglewood for VWR-12984: Water flickers and ↵McCabe Maxsted2010-09-251-1/+1
| | | | disappears in patches, part 2: Also support GL_NV_depth_clamp
* Applied patch by Aleric Inglewood for VWR-12984: Water flickers and ↵McCabe Maxsted2010-09-253-14/+33
| | | | disappears in patches, part 1
* Added the concept of font size multiplier (size_mult).Jacek Antonelli2010-09-102-12/+27
| | | | | This compensates for inherent size differences in each font family, so that UI text is a consistent size, no matter which font you use.
* Added the concept of aliases to LLFontRegistry.Jacek Antonelli2010-09-102-0/+52
| | | | | SansSerif is now an alias for either "DejaVu" or "Liberation", depending on the user's FontChoice setting.
* Potential fix for a crash in llfontglMcCabe Maxsted2010-08-291-6/+12
|
* Don't llerrs if textures have bogus paramsMcCabe Maxsted2010-08-071-1/+3
|
* remove llrender/llglimmediate.cpp and llglimmediate.h (empty files).Armin Weatherwax2010-08-022-2/+0
|
* fix: despam streaming video "Cannot analyze alpha for image with format typ ↵Armin Weatherwax2010-07-011-2/+2
| | | | <foo>"
* Made shader loading use LL_DEBUGS instead of LL_INFOS to reduce log spamMcCabe Maxsted2010-06-221-1/+1
|
* Henri Beauchamp: Port of SG-2.0 alpha and tattoo layers (v6)Armin Weatherwax2010-06-192-0/+4
| | | | | | slviewer-0-v12350-AlphaAndTattooSupport-patch.zip contains the necessary avatar_lad.xml and other artwork. The new avatar_lad.xml crashes clients without alpha and tattoo support at startup.
* Applied ImageGLPickMaskCrashFix patch from Cool Viewer.McCabe Maxsted2010-03-112-6/+18
| | | | | | | | Fixes a bug in v1.23 that sometimes crashes the viewer when touching (or camming on) an object which is being rezzed. Patch by Henri Beauchamp. (slviewer-0-v12350-ImageGLPickMaskCrashFix.patch)
* Fixed a rare crash from textures with too many components.Armin Weatherwax2010-02-221-1/+3
| | | | Only seen in lbsa plaza on OSGrid, so far.
* Ported many texture engine changes from Snowglobe.Jacek Antonelli2010-02-166-70/+315
|
* Merged almost-final version of Imprudence 1.2 into 1.3McCabe Maxsted2009-11-081-2/+1
|\
| * Created our own Linux freetype package, 2.3.11.Jacek Antonelli2009-11-031-2/+1
| |
* | Second Life viewer sources 1.23.3-RCJacek Antonelli2009-06-132-8/+11
| |
* | Second Life viewer sources 1.23.0-RCJacek Antonelli2009-04-3036-1378/+2883
|/
* Second Life viewer sources 1.22.6-RCJacek Antonelli2009-01-282-14/+0
|
* Second Life viewer sources 1.22.5-RCJacek Antonelli2009-01-1131-120/+229
|
* Second Life viewer sources 1.22.3-RCJacek Antonelli2008-12-123-17/+20
|
* Second Life viewer sources 1.22.2-RCJacek Antonelli2008-12-092-1/+5
|
* Second Life viewer sources 1.22.0-RCJacek Antonelli2008-12-0121-433/+679
|
* Second Life viewer sources 1.21.2-RCJacek Antonelli2008-09-122-1/+8
|
* Second Life viewer sources 1.21.0-RCJacek Antonelli2008-09-0633-984/+6873
|
* Second Life viewer sources 1.20.13Jacek Antonelli2008-08-151-1/+9
|
* Second Life viewer sources 1.20.11Jacek Antonelli2008-08-152-10/+1
|
* Second Life viewer sources 1.20.9Jacek Antonelli2008-08-152-7/+19
|
* Second Life viewer sources 1.20.7Jacek Antonelli2008-08-1516-659/+1170
|
* Second Life viewer sources 1.20.6Jacek Antonelli2008-08-155-122/+83
|
* Second Life viewer sources 1.20.5Jacek Antonelli2008-08-153-0/+29
|
* Second Life viewer sources 1.20.4Jacek Antonelli2008-08-151-1/+13
|
* Second Life viewer sources 1.20.3Jacek Antonelli2008-08-157-39/+246
|
* Second Life viewer sources 1.20.2Jacek Antonelli2008-08-154-18/+79
|
* Second Life viewer sources 1.19.1.2Jacek Antonelli2008-08-152-7/+11
|
generated by cgit v1.1 at 2025-03-30 17:51:57 +0000