| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
|
|
|
| |
This reverts commit 87219855c664447a39dd7c2d8866f0a630d1c843.
|
|
|
|
|
|
|
|
|
| |
The Imprudence tag color is part of our official branding. Users can
turn it off, but the color itself is not a matter of user preference.
This reverts commits e7ab172b762bbbb87ca78889fdaecfda39a71233
and c903ce543fecedd53d07f2d0fa7f6b149b2b8a1, and removes two
widgets from Preferences > Colors.
|
|
|
|
|
| |
[ From Tonya Souther's 672:143c811ee5e2 and 688:1900969ebf65 in phoenix-sg ]
(cherry picked from commit d3ffe737a82e4bf54ce1413efeb7e92f43dfccca)
|
|\ |
|
| | |
|
|\ \
| |/
|/|
| |
| |
| |
| | |
Conflicts:
linden/indra/llcommon/CMakeLists.txt
linden/indra/newview/llvoavatar.cpp
linden/indra/newview/viewer_manifest.py
|
| |
| |
| |
| | |
Patch by Seraph Linden.
|
|\ \
| |/
|/|
| |
| |
| |
| |
| | |
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.
|
| | |
|
| | |
|
| |
| |
| |
| | |
review perms
|
| |
| |
| |
| | |
client sees. Hardcoded colors are now used for Imp
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
script is here: http://redmine.kokuaviewer.org/attachments/164/script.txt
I (ArminW) added also a ParticleChatCannel setting to Tazys patch.
|
| |
| |
| |
| | |
This needs moving the new avatar_lad.xml file from the Imprudence toplevel directory to linden/indra/newview/character/
|
| |
| |
| |
| | |
issue tattoo tinting does not work
|
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| | |
|
| |
| |
| |
| | |
(fly) up animation
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
There was a problem with #include "hippolimits.h" because
the file is called hippoLimits.h (with an uppercase L).
After some discussion on IRC it was reluctantly decided that
filenames should be lowercase, as is done for every Linden file.
This is part 2 or 2 (the first part just renamed the files).
This part changes all files to make the viewer compile again
after the renaming.
|
| |\
| | |
| | |
| | | |
browser/media plugin support
|
| | |\ |
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
linden/indra/cmake/GStreamer.cmake
linden/indra/cmake/GStreamer.cmake was deleted: we're going to try to
use system libs, so any improvements that have been made in weekly have
been invane.
linden/indra/newview/llstartup.cpp
Trivial #include collision. One include added another removed. Fixed.
linden/indra/newview/lltoolpie.cpp
Collision with RLV, pretty trivial. Fixed.
linden/indra/newview/viewer_manifest.py
Trivial White space fix collision with commenting out of gstreamer libs. Fixed.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Port of SNOW-802 from SG1. Originally ported by Robin cornelius from
SG 2.1.
Also added a paramter can_use_http to the LLTextureFetchWorker
constructor, to avoid messing with locks.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Viewer 2 texture system"
This reverts commit 087e15e89930d51c3964329befb273ae3b2d330d.
Conflicts:
linden/indra/newview/llsurface.cpp
linden/indra/newview/llviewerwindow.cpp
linden/indra/newview/llvoavatar.cpp
linden/indra/newview/pipeline.cpp
linden/indra/newview/pipeline.h
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
texture system
|
| | | | | | |
|
| | |_|_|/
| |/| | |
| | | | |
| | | | | |
for OpenRegionSettings, adds the new CAPS based WindLight Settings module, cleans up a few UI parts, and rebuilds the ToS window to support OpenSim regions better.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Not sure this helps with non-baking, but it looked wrong.
Also, only bind local texture before they are covered by a bake.
|
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Port of SNOW-802 from SG1. Originally ported by Robin cornelius from
SG 2.1.
Also added a paramter can_use_http to the LLTextureFetchWorker
constructor, to avoid messing with locks.
|
| |/ / |
|
| | |
| | |
| | |
| | |
| | |
| | | |
Incorporated Snowglobe changesets:
http://svn.secondlife.com/trac/linden/changeset/2823
http://svn.secondlife.com/trac/linden/changeset/2757
|
| | |
| | |
| | |
| | | |
checkbox to enable/disable the feature. The font on the tags is rendered in bold when the option is active.
|
| | |
| | |
| | |
| | | |
See http://redmine.imprudenceviewer.org/issues/556
|
| | | |
|
| |/ |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| | |
Incorporated Snowglobe changesets:
http://svn.secondlife.com/trac/linden/changeset/2823
http://svn.secondlife.com/trac/linden/changeset/2757
|
| | |
|
| | |
|
|/ |
|
| |
|
| |
|