Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Black Dragon Viewer
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Package Registry
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
NiranV
Black Dragon Viewer
Commits
8e91a4f6
Commit
8e91a4f6
authored
Aug 09, 2020
by
NiranV
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed: Merge.
parent
8ae6a6ad
Changes
49
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
49 changed files
with
735 additions
and
1550 deletions
+735
-1550
README.md
README.md
+1
-0
autobuild.xml
autobuild.xml
+1
-25
build.sh
build.sh
+1
-1
indra/llappearance/llwearabletype.cpp
indra/llappearance/llwearabletype.cpp
+11
-39
indra/llcommon/llerrorthread.cpp
indra/llcommon/llerrorthread.cpp
+1
-3
indra/llcommon/lleventtimer.cpp
indra/llcommon/lleventtimer.cpp
+0
-16
indra/llimage/llimagefilter.cpp
indra/llimage/llimagefilter.cpp
+4
-4
indra/llimage/llimagejpeg.cpp
indra/llimage/llimagejpeg.cpp
+0
-4
indra/llinventory/llsettingssky.cpp
indra/llinventory/llsettingssky.cpp
+9
-9
indra/llmath/llmath.h
indra/llmath/llmath.h
+1
-1
indra/llmath/llvector4a.h
indra/llmath/llvector4a.h
+3
-3
indra/llrender/llatmosphere.cpp
indra/llrender/llatmosphere.cpp
+4
-4
indra/llrender/llgl.cpp
indra/llrender/llgl.cpp
+0
-8
indra/llrender/llimagegl.cpp
indra/llrender/llimagegl.cpp
+3
-37
indra/llrender/llshadermgr.cpp
indra/llrender/llshadermgr.cpp
+1
-0
indra/llrender/llshadermgr.h
indra/llrender/llshadermgr.h
+1
-0
indra/llui/llconsole.cpp
indra/llui/llconsole.cpp
+1
-5
indra/llui/lllayoutstack.cpp
indra/llui/lllayoutstack.cpp
+0
-4
indra/newview/CMakeLists.txt
indra/newview/CMakeLists.txt
+0
-4
indra/newview/app_settings/shaders/class1/deferred/cloudsV.glsl
...newview/app_settings/shaders/class1/deferred/cloudsV.glsl
+2
-5
indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyF.glsl
...pp_settings/shaders/class1/deferred/fullbrightShinyF.glsl
+15
-34
indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
...wview/app_settings/shaders/class1/deferred/materialF.glsl
+1
-23
indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl
...pp_settings/shaders/class1/deferred/multiPointLightF.glsl
+101
-97
indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
...ew/app_settings/shaders/class1/deferred/softenLightF.glsl
+3
-3
indra/newview/app_settings/shaders/class1/environment/encodeNormF.glsl
.../app_settings/shaders/class1/environment/encodeNormF.glsl
+0
-3
indra/newview/app_settings/shaders/class1/lighting/lightFullbrightAlphaMaskF.glsl
...gs/shaders/class1/lighting/lightFullbrightAlphaMaskF.glsl
+4
-15
indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
...ew/app_settings/shaders/class2/deferred/softenLightF.glsl
+14
-80
indra/newview/llappviewer.cpp
indra/newview/llappviewer.cpp
+3
-24
indra/newview/llfloaterimcontainer.cpp
indra/newview/llfloaterimcontainer.cpp
+0
-3
indra/newview/llfloaterpreference.cpp
indra/newview/llfloaterpreference.cpp
+1
-1
indra/newview/llmeshrepository.cpp
indra/newview/llmeshrepository.cpp
+1
-1
indra/newview/llpanelface.cpp
indra/newview/llpanelface.cpp
+4
-38
indra/newview/llpanellogin.cpp
indra/newview/llpanellogin.cpp
+2
-106
indra/newview/llpanelprimmediacontrols.cpp
indra/newview/llpanelprimmediacontrols.cpp
+5
-4
indra/newview/llpanelprimmediacontrols.h
indra/newview/llpanelprimmediacontrols.h
+3
-5
indra/newview/llstartup.cpp
indra/newview/llstartup.cpp
+2
-4
indra/newview/lltexturectrl.cpp
indra/newview/lltexturectrl.cpp
+24
-10
indra/newview/lltexturectrl.h
indra/newview/lltexturectrl.h
+6
-3
indra/newview/lltextureview.cpp
indra/newview/lltextureview.cpp
+0
-29
indra/newview/lltoast.cpp
indra/newview/lltoast.cpp
+0
-6
indra/newview/lltoolpie.cpp
indra/newview/lltoolpie.cpp
+9
-14
indra/newview/lltoolpie.h
indra/newview/lltoolpie.h
+4
-6
indra/newview/llviewerdisplay.cpp
indra/newview/llviewerdisplay.cpp
+8
-90
indra/newview/llviewerjoystick.cpp
indra/newview/llviewerjoystick.cpp
+4
-29
indra/newview/llviewermediafocus.cpp
indra/newview/llviewermediafocus.cpp
+17
-13
indra/newview/llviewermediafocus.h
indra/newview/llviewermediafocus.h
+2
-3
indra/newview/llviewerstats.cpp
indra/newview/llviewerstats.cpp
+0
-19
indra/newview/pipeline.cpp
indra/newview/pipeline.cpp
+457
-714
indra/newview/rlvcommon.cpp
indra/newview/rlvcommon.cpp
+1
-1
No files found.
README.md
View file @
8e91a4f6
Black Dragon Viewer
====================
This project manages the source code for the
[
Black Dragon
](
https://niranv-sl.blogspot.de/
)
Viewer.
...
...
autobuild.xml
View file @
8e91a4f6
...
...
@@ -1746,17 +1746,9 @@
<key>
archive
</key>
<map>
<key>
hash
</key>
<<<<<<
< HEAD
<string
>
6bb48e878e7f4e7b6630a6f3a5fd2f89
</string>
<key>
hash_algorithm
</key>
<string>
md5
</string>
<key>
url
</key>
<string>
file:///c:/bld/kdu-7.10.4.200681608-windows64-200681608.tar.bz2
</string>
=======
<string>
3dfeb869c781a766874f0aedc7d4fcef
</string>
<key>
url
</key>
<string>
http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/55188/512576/kdu-7.10.4.539108-windows64-539108.tar.bz2
</string>
>>>>>>> Linden_Release/DRTVWR-497
</map>
<key>
name
</key>
<string>
windows64
</string>
...
...
@@ -2776,15 +2768,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>
archive
</key>
<map>
<key>
hash
</key>
<<<<<<
< HEAD
<string>
545954e46a316e469f6b68ecbcb76573
</string>
<key>
url
</key>
<string>
http://viewer.catznip.com/downloads/packages/openjpeg-1.5.2.171271050-windows-171271050.tar.bz2
</string>
=======
<string>
222a406ecb4071a9cc9635353afa337e
</string>
<key>
url
</key>
<string>
http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54977/511775/openjpeg-1.5.1.538970-windows-538970.tar.bz2
</string>
>>>>>>> Linden_Release/DRTVWR-497
</map>
<key>
name
</key>
<string>
windows
</string>
...
...
@@ -2794,26 +2780,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>
archive
</key>
<map>
<key>
hash
</key>
<<<<<<
< HEAD
<string>
07cff9eafaecfbe6f44e2a05b3465cae
</string>
<key>
url
</key>
<string>
https://pkg.alchemyviewer.org/repository/autobuild-external/tmpanext/openjpeg-1.5.1.200900057-windows64-200900057.tar.bz2
</string>
=======
<string>
5b5c80807fa8161f3480be3d89fe9516
</string>
<key>
url
</key>
<string>
http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54974/511767/openjpeg-1.5.1.538970-windows64-538970.tar.bz2
</string>
>>>>>>> Linden_Release/DRTVWR-497
</map>
<key>
name
</key>
<string>
windows64
</string>
</map>
</map>
<key>
version
</key>
<<<<<<
< HEAD
<string
>
1.4.2.201412051021
</string>
=======
<string>
1.5.1.538970
</string>
>>>>>>> Linden_Release/DRTVWR-497
<string>
1.5.1.200900057
</string>
</map>
<key>
openssl
</key>
<map>
...
...
build.sh
View file @
8e91a4f6
...
...
@@ -28,7 +28,7 @@ build_dir_Linux()
build_dir_CYGWIN
()
{
echo
build-vc
${
AUTOBUILD_VSVER
:-
120
}
-
${
AUTOBUILD_ADDRSIZE
}
echo
build-vc
120
-
${
AUTOBUILD_ADDRSIZE
}
}
viewer_channel_suffix
()
...
...
indra/llappearance/llwearabletype.cpp
View file @
8e91a4f6
...
...
@@ -60,53 +60,23 @@ struct WearableEntry : public LLDictionaryEntry
class
LLWearableDictionary
:
public
LLParamSingleton
<
LLWearableDictionary
>
,
public
LLDictionary
<
LLWearableType
::
EType
,
WearableEntry
>
{
<<<<<<<
HEAD
LLSINGLETON
(
LLWearableDictionary
);
LLSINGLETON
(
LLWearableDictionary
,
LLWearableType
&
);
// [RLVa:KB] - Checked: 2010-03-03 (RLVa-1.2.0a) | Added: RLVa-1.2.0a
protected:
// The default implementation asserts on 'notFound()' and returns -1 which isn't a valid EWearableType
virtual
LLWearableType
::
EType
notFound
()
const
{
return
LLWearableType
::
WT_INVALID
;
}
// [/RLVa:KB]
=======
LLSINGLETON
(
LLWearableDictionary
,
LLWearableType
&
);
>>>>>>>
Linden_Release
/
DRTVWR
-
497
};
LLWearableDictionary
::
LLWearableDictionary
(
LLWearableType
&
wtype
)
{
<<<<<<<
HEAD
if
(
!
LLWearableType
::
instanceExists
())
{
// LLWearableType is effectively a wrapper around LLWearableDictionary and is used as storage for LLTranslationBridge
// Todo: consider merging LLWearableType and LLWearableDictionary
LL_WARNS
()
<<
"Initing LLWearableDictionary without LLWearableType"
<<
LL_ENDL
;
}
addEntry
(
LLWearableType
::
WT_SHAPE
,
new
WearableEntry
(
"shape"
,
"New Shape"
,
LLAssetType
::
AT_BODYPART
,
LLInventoryType
::
ICONNAME_BODYPART_SHAPE
,
FALSE
,
FALSE
));
addEntry
(
LLWearableType
::
WT_SKIN
,
new
WearableEntry
(
"skin"
,
"New Skin"
,
LLAssetType
::
AT_BODYPART
,
LLInventoryType
::
ICONNAME_BODYPART_SKIN
,
FALSE
,
FALSE
));
addEntry
(
LLWearableType
::
WT_HAIR
,
new
WearableEntry
(
"hair"
,
"New Hair"
,
LLAssetType
::
AT_BODYPART
,
LLInventoryType
::
ICONNAME_BODYPART_HAIR
,
FALSE
,
FALSE
));
addEntry
(
LLWearableType
::
WT_EYES
,
new
WearableEntry
(
"eyes"
,
"New Eyes"
,
LLAssetType
::
AT_BODYPART
,
LLInventoryType
::
ICONNAME_BODYPART_EYES
,
FALSE
,
FALSE
));
addEntry
(
LLWearableType
::
WT_SHIRT
,
new
WearableEntry
(
"shirt"
,
"New Shirt"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_SHIRT
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_PANTS
,
new
WearableEntry
(
"pants"
,
"New Pants"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_PANTS
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_SHOES
,
new
WearableEntry
(
"shoes"
,
"New Shoes"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_SHOES
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_SOCKS
,
new
WearableEntry
(
"socks"
,
"New Socks"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_SOCKS
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_JACKET
,
new
WearableEntry
(
"jacket"
,
"New Jacket"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_JACKET
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_GLOVES
,
new
WearableEntry
(
"gloves"
,
"New Gloves"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_GLOVES
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_UNDERSHIRT
,
new
WearableEntry
(
"undershirt"
,
"New Undershirt"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_UNDERSHIRT
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_UNDERPANTS
,
new
WearableEntry
(
"underpants"
,
"New Underpants"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_UNDERPANTS
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_SKIRT
,
new
WearableEntry
(
"skirt"
,
"New Skirt"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_SKIRT
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_ALPHA
,
new
WearableEntry
(
"alpha"
,
"New Alpha"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_ALPHA
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_TATTOO
,
new
WearableEntry
(
"tattoo"
,
"New Tattoo"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_TATTOO
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_UNIVERSAL
,
new
WearableEntry
(
"universal"
,
"New Universal"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_UNIVERSAL
,
FALSE
,
TRUE
));
// [SL:KB] - Patch: Appearance-Misc | Checked: 2011-05-29 (Catznip-2.6)
addEntry
(
LLWearableType
::
WT_PHYSICS
,
new
WearableEntry
(
"physics"
,
"New Physics"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_PHYSICS
,
TRUE
,
FALSE
));
// [/SL:KB]
// addEntry(LLWearableType::WT_PHYSICS, new WearableEntry("physics", "New Physics", LLAssetType::AT_CLOTHING, LLInventoryType::ICONNAME_CLOTHING_PHYSICS, TRUE, TRUE));
addEntry
(
LLWearableType
::
WT_INVALID
,
new
WearableEntry
(
"invalid"
,
"Invalid Wearable"
,
LLAssetType
::
AT_NONE
,
LLInventoryType
::
ICONNAME_UNKNOWN
,
FALSE
,
FALSE
));
addEntry
(
LLWearableType
::
WT_NONE
,
new
WearableEntry
(
"none"
,
"Invalid Wearable"
,
LLAssetType
::
AT_NONE
,
LLInventoryType
::
ICONNAME_NONE
,
FALSE
,
FALSE
));
=======
addEntry
(
LLWearableType
::
WT_SHAPE
,
new
WearableEntry
(
wtype
,
"shape"
,
"New Shape"
,
LLAssetType
::
AT_BODYPART
,
LLInventoryType
::
ICONNAME_BODYPART_SHAPE
,
FALSE
,
FALSE
));
addEntry
(
LLWearableType
::
WT_SKIN
,
new
WearableEntry
(
wtype
,
"skin"
,
"New Skin"
,
LLAssetType
::
AT_BODYPART
,
LLInventoryType
::
ICONNAME_BODYPART_SKIN
,
FALSE
,
FALSE
));
addEntry
(
LLWearableType
::
WT_HAIR
,
new
WearableEntry
(
wtype
,
"hair"
,
"New Hair"
,
LLAssetType
::
AT_BODYPART
,
LLInventoryType
::
ICONNAME_BODYPART_HAIR
,
FALSE
,
FALSE
));
...
...
@@ -115,20 +85,22 @@ LLWearableDictionary::LLWearableDictionary(LLWearableType& wtype)
addEntry
(
LLWearableType
::
WT_PANTS
,
new
WearableEntry
(
wtype
,
"pants"
,
"New Pants"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_PANTS
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_SHOES
,
new
WearableEntry
(
wtype
,
"shoes"
,
"New Shoes"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_SHOES
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_SOCKS
,
new
WearableEntry
(
wtype
,
"socks"
,
"New Socks"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_SOCKS
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_JACKET
,
new
WearableEntry
(
wtype
,
"jacket"
,
"New Jacket"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_JACKET
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_GLOVES
,
new
WearableEntry
(
wtype
,
"gloves"
,
"New Gloves"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_GLOVES
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_UNDERSHIRT
,
new
WearableEntry
(
wtype
,
"undershirt"
,
"New Undershirt"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_UNDERSHIRT
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_UNDERPANTS
,
new
WearableEntry
(
wtype
,
"underpants"
,
"New Underpants"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_UNDERPANTS
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_JACKET
,
new
WearableEntry
(
wtype
,
"jacket"
,
"New Jacket"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_JACKET
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_GLOVES
,
new
WearableEntry
(
wtype
,
"gloves"
,
"New Gloves"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_GLOVES
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_UNDERSHIRT
,
new
WearableEntry
(
wtype
,
"undershirt"
,
"New Undershirt"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_UNDERSHIRT
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_UNDERPANTS
,
new
WearableEntry
(
wtype
,
"underpants"
,
"New Underpants"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_UNDERPANTS
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_SKIRT
,
new
WearableEntry
(
wtype
,
"skirt"
,
"New Skirt"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_SKIRT
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_ALPHA
,
new
WearableEntry
(
wtype
,
"alpha"
,
"New Alpha"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_ALPHA
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_TATTOO
,
new
WearableEntry
(
wtype
,
"tattoo"
,
"New Tattoo"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_TATTOO
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_UNIVERSAL
,
new
WearableEntry
(
wtype
,
"universal"
,
"New Universal"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_UNIVERSAL
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_TATTOO
,
new
WearableEntry
(
wtype
,
"tattoo"
,
"New Tattoo"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_TATTOO
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_UNIVERSAL
,
new
WearableEntry
(
wtype
,
"universal"
,
"New Universal"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_UNIVERSAL
,
FALSE
,
TRUE
));
addEntry
(
LLWearableType
::
WT_PHYSICS
,
new
WearableEntry
(
wtype
,
"physics"
,
"New Physics"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_PHYSICS
,
TRUE
,
TRUE
));
// [SL:KB] - Patch: Appearance-Misc | Checked: 2011-05-29 (Catznip-2.6)
addEntry
(
LLWearableType
::
WT_PHYSICS
,
new
WearableEntry
(
wtype
,
"physics"
,
"New Physics"
,
LLAssetType
::
AT_CLOTHING
,
LLInventoryType
::
ICONNAME_CLOTHING_PHYSICS
,
TRUE
,
FALSE
));
// [/SL:KB]
// addEntry(LLWearableType::WT_PHYSICS, new WearableEntry(wtype, "physics", "New Physics", LLAssetType::AT_CLOTHING, LLInventoryType::ICONNAME_CLOTHING_PHYSICS, TRUE, TRUE));
addEntry
(
LLWearableType
::
WT_INVALID
,
new
WearableEntry
(
wtype
,
"invalid"
,
"Invalid Wearable"
,
LLAssetType
::
AT_NONE
,
LLInventoryType
::
ICONNAME_UNKNOWN
,
FALSE
,
FALSE
));
addEntry
(
LLWearableType
::
WT_NONE
,
new
WearableEntry
(
wtype
,
"none"
,
"Invalid Wearable"
,
LLAssetType
::
AT_NONE
,
LLInventoryType
::
ICONNAME_NONE
,
FALSE
,
FALSE
));
>>>>>>>
Linden_Release
/
DRTVWR
-
497
}
...
...
indra/llcommon/llerrorthread.cpp
View file @
8e91a4f6
...
...
@@ -106,13 +106,11 @@ void LLErrorThread::run()
// This thread sits and waits for the sole purpose
// of waiting for the signal/exception handlers to flag the
// application state as APP_STATUS_ERROR.
LL_INFOS
()
<<
"thread_error - Waiting for an error"
<<
LL_ENDL
;
//
LL_INFOS() << "thread_error - Waiting for an error" << LL_ENDL;
S32
counter
=
0
;
while
(
!
(
LLApp
::
isError
()
||
LLApp
::
isStopped
()))
{
ms_sleep
(
10
);
counter
++
;
}
if
(
LLApp
::
isError
())
{
...
...
indra/llcommon/lleventtimer.cpp
View file @
8e91a4f6
...
...
@@ -57,12 +57,7 @@ LLEventTimer::~LLEventTimer()
//static
void
LLEventTimer
::
updateClass
()
{
<<<<<<<
HEAD
std
::
list
<
LLEventTimer
*>
completed_timers
;
for
(
instance_iter
iter
=
beginInstances
(),
end
=
endInstances
();
iter
!=
end
;
)
=======
for
(
auto
&
timer
:
instance_snapshot
())
>>>>>>>
Linden_Release
/
DRTVWR
-
497
{
F32
et
=
timer
.
mEventTimer
.
getElapsedTimeF32
();
if
(
timer
.
mEventTimer
.
getStarted
()
&&
et
>
timer
.
mPeriod
)
{
...
...
@@ -73,17 +68,6 @@ void LLEventTimer::updateClass()
}
}
}
<<<<<<<
HEAD
if
(
completed_timers
.
size
()
>
0
)
{
for
(
LLEventTimer
*
completed_timer
:
completed_timers
)
{
delete
completed_timer
;
}
}
=======
>>>>>>>
Linden_Release
/
DRTVWR
-
497
}
indra/llimage/llimagefilter.cpp
View file @
8e91a4f6
...
...
@@ -663,7 +663,7 @@ void LLImageFilter::computeHistograms()
void
LLImageFilter
::
filterGrayScale
()
{
LLMatrix3
gray_scale
;
LLVector3
luminosity
(
0.2125
,
0.7154
,
0.0721
);
LLVector3
luminosity
(
0.2125
f
,
0.7154
f
,
0.0721
f
);
gray_scale
.
setRows
(
luminosity
,
luminosity
,
luminosity
);
gray_scale
.
transpose
();
colorTransform
(
gray_scale
);
...
...
@@ -672,9 +672,9 @@ void LLImageFilter::filterGrayScale()
void
LLImageFilter
::
filterSepia
()
{
LLMatrix3
sepia
;
sepia
.
setRows
(
LLVector3
(
0.3588
,
0.7044
,
0.1368
),
LLVector3
(
0.2990
,
0.5870
,
0.1140
),
LLVector3
(
0.2392
,
0.4696
,
0.0912
));
sepia
.
setRows
(
LLVector3
(
0.3588
f
,
0.7044
f
,
0.1368
f
),
LLVector3
(
0.2990
f
,
0.5870
f
,
0.1140
f
),
LLVector3
(
0.2392
f
,
0.4696
f
,
0.0912
f
));
sepia
.
transpose
();
colorTransform
(
sepia
);
}
...
...
indra/llimage/llimagejpeg.cpp
View file @
8e91a4f6
...
...
@@ -386,10 +386,6 @@ boolean LLImageJPEG::encodeEmptyOutputBuffer( j_compress_ptr cinfo )
{
self
->
setLastError
(
"Out of memory in LLImageJPEG::encodeEmptyOutputBuffer( j_compress_ptr cinfo )"
);
LLTHROW
(
LLContinueError
(
"Out of memory in LLImageJPEG::encodeEmptyOutputBuffer( j_compress_ptr cinfo )"
));
<<<<<<<
HEAD
// return false;
=======
>>>>>>>
Linden_Release
/
DRTVWR
-
497
}
memcpy
(
new_buffer
,
self
->
mOutputBuffer
,
self
->
mOutputBufferSize
);
/* Flawfinder: ignore */
delete
[]
self
->
mOutputBuffer
;
...
...
indra/llinventory/llsettingssky.cpp
View file @
8e91a4f6
...
...
@@ -719,25 +719,25 @@ LLSD LLSettingsSky::defaults(const LLSettingsBase::TrackPosition& position)
moonquat
=
convert_azimuth_and_altitude_to_quat
(
altitude
+
(
F_PI
*
0.125
f
),
azimuth
+
(
F_PI
*
0.125
f
));
// Magic constants copied form dfltsetting.xml
dfltsetting
[
SETTING_CLOUD_COLOR
]
=
LLColor4
(
0.4099
,
0.4099
,
0.4099
,
0.0
).
getValue
();
dfltsetting
[
SETTING_CLOUD_POS_DENSITY1
]
=
LLColor4
(
1.0000
,
0.5260
,
1.0000
,
0.0
).
getValue
();
dfltsetting
[
SETTING_CLOUD_POS_DENSITY2
]
=
LLColor4
(
1.0000
,
0.5260
,
1.0000
,
0.0
).
getValue
();
dfltsetting
[
SETTING_CLOUD_SCALE
]
=
LLSD
::
Real
(
0.4199
);
dfltsetting
[
SETTING_CLOUD_COLOR
]
=
LLColor4
(
0.4099
f
,
0.4099
f
,
0.4099
f
,
0.0
).
getValue
();
dfltsetting
[
SETTING_CLOUD_POS_DENSITY1
]
=
LLColor4
(
1.0000
f
,
0.5260
f
,
1.0000
f
,
0.0
).
getValue
();
dfltsetting
[
SETTING_CLOUD_POS_DENSITY2
]
=
LLColor4
(
1.0000
f
,
0.5260
f
,
1.0000
f
,
0.0
).
getValue
();
dfltsetting
[
SETTING_CLOUD_SCALE
]
=
LLSD
::
Real
(
0.4199
f
);
dfltsetting
[
SETTING_CLOUD_SCROLL_RATE
]
=
LLSDArray
(
0.0
f
)(
0.0
f
);
dfltsetting
[
SETTING_CLOUD_SHADOW
]
=
LLSD
::
Real
(
0.2699
);
dfltsetting
[
SETTING_CLOUD_SHADOW
]
=
LLSD
::
Real
(
0.2699
f
);
dfltsetting
[
SETTING_CLOUD_VARIANCE
]
=
LLSD
::
Real
(
0.0
);
dfltsetting
[
SETTING_DOME_OFFSET
]
=
LLSD
::
Real
(
0.96
f
);
dfltsetting
[
SETTING_DOME_RADIUS
]
=
LLSD
::
Real
(
15000.
f
);
dfltsetting
[
SETTING_GAMMA
]
=
LLSD
::
Real
(
1.0
);
dfltsetting
[
SETTING_GLOW
]
=
LLColor4
(
5.000
,
0.0010
,
-
0.4799
,
1.0
).
getValue
();
dfltsetting
[
SETTING_GLOW
]
=
LLColor4
(
5.000
f
,
0.0010
f
,
-
0.4799
f
,
1.0
f
).
getValue
();
dfltsetting
[
SETTING_MAX_Y
]
=
LLSD
::
Real
(
1605
);
dfltsetting
[
SETTING_MOON_ROTATION
]
=
moonquat
.
getValue
();
dfltsetting
[
SETTING_MOON_BRIGHTNESS
]
=
LLSD
::
Real
(
0.5
f
);
dfltsetting
[
SETTING_STAR_BRIGHTNESS
]
=
LLSD
::
Real
(
250.0000
);
dfltsetting
[
SETTING_SUNLIGHT_COLOR
]
=
LLColor4
(
0.7342
,
0.7815
,
0.8999
,
0.0
).
getValue
();
dfltsetting
[
SETTING_STAR_BRIGHTNESS
]
=
LLSD
::
Real
(
250.0000
f
);
dfltsetting
[
SETTING_SUNLIGHT_COLOR
]
=
LLColor4
(
0.7342
f
,
0.7815
f
,
0.8999
f
,
0.0
f
).
getValue
();
dfltsetting
[
SETTING_SUN_ROTATION
]
=
sunquat
.
getValue
();
dfltsetting
[
SETTING_BLOOM_TEXTUREID
]
=
GetDefaultBloomTextureId
();
...
...
@@ -1343,7 +1343,7 @@ void LLSettingsSky::calculateLightSettings() const
F32
moon_brightness
=
getIsMoonUp
()
?
getMoonBrightness
()
:
0.001
f
;
LLColor3
moonlight
=
getMoonlightColor
();
LLColor3
moonlight_b
(
0.66
,
0.66
,
1.2
);
// scotopic ambient value
LLColor3
moonlight_b
(
0.66
f
,
0.66
f
,
1.2
f
);
// scotopic ambient value
componentMultBy
(
moonlight
,
componentExp
((
light_atten
*
-
1.
f
)
*
lighty
));
...
...
indra/llmath/llmath.h
View file @
8e91a4f6
...
...
@@ -78,7 +78,7 @@ const F32 DEG_TO_RAD = 0.017453292519943295769236907684886f;
const
F32
RAD_TO_DEG
=
57.295779513082320876798154814105
f
;
const
F32
F_APPROXIMATELY_ZERO
=
0.00001
f
;
const
F32
F_LN10
=
2.3025850929940456840179914546844
f
;
const
F32
OO_LN10
=
0.43429448190325182765112891891661
;
const
F32
OO_LN10
=
0.43429448190325182765112891891661
f
;
const
F32
F_LN2
=
0.69314718056
f
;
const
F32
OO_LN2
=
1.4426950408889634073599246810019
f
;
...
...
indra/llmath/llvector4a.h
View file @
8e91a4f6
...
...
@@ -92,14 +92,14 @@ class LLVector4a
// CONSTRUCTORS
////////////////////////////////////
#if SHOW_ASSERT
/*
#if SHOW_ASSERT
LLVector4a()
{ //DO NOT INITIALIZE -- The overhead is completely unnecessary
ll_assert_aligned(this,16);
}
#else
#else
*/
LLVector4a
()
=
default
;
#endif
//
#endif
LLVector4a
(
F32
x
,
F32
y
,
F32
z
,
F32
w
=
0.
f
)
{
...
...
indra/llrender/llatmosphere.cpp
View file @
8e91a4f6
...
...
@@ -86,8 +86,8 @@ AtmosphericModelSettings::AtmosphericModelSettings()
,
m_sunArcRadians
(
0.00045
f
)
,
m_mieAnisotropy
(
0.8
f
)
{
DensityLayer
rayleigh_density
(
0.0
,
1.0
,
-
1.0
/
kRayleighScaleHeight
,
0.0
,
0.0
);
DensityLayer
mie_density
(
0.0
,
1.0
,
-
1.0
/
kMieScaleHeight
,
0.0
,
0.0
);
DensityLayer
rayleigh_density
(
0.0
f
,
1.0
f
,
-
1.0
f
/
kRayleighScaleHeight
,
0.0
f
,
0.0
f
);
DensityLayer
mie_density
(
0.0
f
,
1.0
f
,
-
1.0
f
/
kMieScaleHeight
,
0.0
,
0.0
);
m_rayleighProfile
.
push_back
(
rayleigh_density
);
m_mieProfile
.
push_back
(
mie_density
);
...
...
@@ -96,8 +96,8 @@ AtmosphericModelSettings::AtmosphericModelSettings()
// decreasing linearly from 1 to 0 between 25 and 40km. This is an approximate
// profile from http://www.kln.ac.lk/science/Chemistry/Teaching_Resources/
// Documents/Introduction%20to%20atmospheric%20chemistry.pdf (page 10).
m_absorptionProfile
.
push_back
(
DensityLayer
(
25000.0
,
0.0
,
0.0
,
1.0
/
15000.0
,
-
2.0
/
3.0
));
m_absorptionProfile
.
push_back
(
DensityLayer
(
0.0
,
0.0
,
0.0
,
-
1.0
/
15000.0
,
8.0
/
3.0
));
m_absorptionProfile
.
push_back
(
DensityLayer
(
25000.0
f
,
0.0
f
,
0.0
f
,
1.0
f
/
15000.0
f
,
-
2.0
f
/
3.0
f
));
m_absorptionProfile
.
push_back
(
DensityLayer
(
0.0
f
,
0.0
f
,
0.0
f
,
-
1.0
f
/
15000.0
f
,
8.0
f
/
3.0
f
));
}
AtmosphericModelSettings
::
AtmosphericModelSettings
(
...
...
indra/llrender/llgl.cpp
View file @
8e91a4f6
...
...
@@ -2465,11 +2465,7 @@ void LLGLNamePool::release(GLuint name)
//static
void
LLGLNamePool
::
upkeepPools
()
{
<<<<<<<
HEAD
for
(
tracker_t
::
instance_iter
iter
=
beginInstances
(),
end
=
endInstances
();
iter
!=
end
;
++
iter
)
=======
for
(
auto
&
pool
:
instance_snapshot
())
>>>>>>>
Linden_Release
/
DRTVWR
-
497
{
pool
.
upkeep
();
}
...
...
@@ -2478,11 +2474,7 @@ void LLGLNamePool::upkeepPools()
//static
void
LLGLNamePool
::
cleanupPools
()
{
<<<<<<<
HEAD
for
(
tracker_t
::
instance_iter
iter
=
beginInstances
(),
end
=
endInstances
();
iter
!=
end
;
++
iter
)
=======
for
(
auto
&
pool
:
instance_snapshot
())
>>>>>>>
Linden_Release
/
DRTVWR
-
497
{
pool
.
cleanup
();
}
...
...
indra/llrender/llimagegl.cpp
View file @
8e91a4f6
...
...
@@ -985,41 +985,6 @@ BOOL LLImageGL::preAddToAtlas(S32 discard_level, const LLImageRaw* raw_image)
return
FALSE
;
}
<<<<<<<
HEAD
if
(
!
mHasExplicitFormat
)
{
switch
(
mComponents
)
{
case
1
:
// Use luminance alpha (for fonts)
mFormatInternal
=
GL_LUMINANCE8
;
mFormatPrimary
=
GL_LUMINANCE
;
mFormatType
=
GL_UNSIGNED_BYTE
;
break
;
case
2
:
// Use luminance alpha (for fonts)
mFormatInternal
=
GL_LUMINANCE8_ALPHA8
;
mFormatPrimary
=
GL_LUMINANCE_ALPHA
;
mFormatType
=
GL_UNSIGNED_BYTE
;
break
;
case
3
:
mFormatInternal
=
GL_RGB8
;
mFormatPrimary
=
GL_RGB
;
mFormatType
=
GL_UNSIGNED_BYTE
;
break
;
case
4
:
mFormatInternal
=
GL_RGBA8
;
mFormatPrimary
=
GL_RGBA
;
mFormatType
=
GL_UNSIGNED_BYTE
;
break
;
default:
//BD
LL_WARNS
()
<<
"Bad number of components for texture: "
<<
(
U32
)
getComponents
()
<<
LL_ENDL
;
return
FALSE
;
break
;
}
}
=======
if
(
!
mHasExplicitFormat
)
{
switch
(
mComponents
)
...
...
@@ -1065,10 +1030,11 @@ BOOL LLImageGL::preAddToAtlas(S32 discard_level, const LLImageRaw* raw_image)
mFormatType
=
GL_UNSIGNED_BYTE
;
break
;
default:
LL_ERRS
()
<<
"Bad number of components for texture: "
<<
(
U32
)
getComponents
()
<<
LL_ENDL
;
//BD
LL_WARNS
()
<<
"Bad number of components for texture: "
<<
(
U32
)
getComponents
()
<<
LL_ENDL
;
return
FALSE
;
}
}
>>>>>>>
Linden_Release
/
DRTVWR
-
497
mCurrentDiscardLevel
=
discard_level
;
mDiscardLevelInAtlas
=
discard_level
;
...
...
indra/llrender/llshadermgr.cpp
View file @
8e91a4f6
...
...
@@ -1365,6 +1365,7 @@ void LLShaderMgr::initAttribsAndUniforms()
mReservedUniforms
.
push_back
(
"alpha_ramp"
);
mReservedUniforms
.
push_back
(
"origin"
);
mReservedUniforms
.
push_back
(
"display_gamma"
);
mReservedUniforms
.
push_back
(
"inscatter"
);
mReservedUniforms
.
push_back
(
"sun_size"
);
...
...
indra/llrender/llshadermgr.h
View file @
8e91a4f6
...
...
@@ -217,6 +217,7 @@ class LLShaderMgr
TERRAIN_ALPHARAMP
,
SHINY_ORIGIN
,
DISPLAY_GAMMA
,
INSCATTER_RT
,
SUN_SIZE
,
...
...
indra/llui/llconsole.cpp
View file @
8e91a4f6
...
...
@@ -370,12 +370,8 @@ LLConsole::Paragraph::Paragraph (LLWString str, const LLColor4 &color, F32 add_t
// called once per frame regardless of console visibility
// static
void
LLConsole
::
updateClass
()
{
<<<<<<<
HEAD
for
(
instance_iter
it
=
beginInstances
(),
it_end
=
endInstances
();
it
!=
it_end
;
++
it
)
=======
{
for
(
auto
&
con
:
instance_snapshot
())
>>>>>>>
Linden_Release
/
DRTVWR
-
497
{
con
.
update
();
}
...
...
indra/llui/lllayoutstack.cpp
View file @
8e91a4f6
...
...
@@ -636,11 +636,7 @@ void LLLayoutStack::createResizeBar(LLLayoutPanel* panelp)
//static
void
LLLayoutStack
::
updateClass
()
{
<<<<<<<
HEAD
for
(
instance_iter
it
=
beginInstances
(),
end
=
endInstances
();
it
!=
end
;
++
it
)
=======
for
(
auto
&
layout
:
instance_snapshot
())
>>>>>>>
Linden_Release
/
DRTVWR
-
497
{
layout
.
updateLayout
();
layout
.
mAnimatedThisFrame
=
false
;
...
...
indra/newview/CMakeLists.txt
View file @
8e91a4f6
...
...
@@ -1639,10 +1639,6 @@ if (WINDOWS)
opengl32
${
WINDOWS_LIBRARIES
}
comdlg32
<<<<<<< HEAD
dinput8
=======
>>>>>>> Linden_Release/DRTVWR-497
dxguid
kernel32
odbc32
...
...
indra/newview/app_settings/shaders/class1/deferred/cloudsV.glsl
View file @
8e91a4f6
...
...
@@ -70,18 +70,15 @@ uniform float cloud_scale;
// NOTE: Keep these in sync!
// indra\newview\app_settings\shaders\class1\deferred\skyV.glsl
// indra\newview\app_settings\shaders\class1\deferred\cloudsV.glsl
// indra\newview\app-settings\shaders\class2\windlight\cloudsV.glsl
// indra\newview\lllegacyatmospherics.cpp
// indra\newview\llsettingsvo.cpp
void
main
()
{
// World / view / projection
gl_Position
=
modelview_projection_matrix
*
vec4
(
position
.
xyz
,
1
.
0
);
// Texture coords
// SL-13084 EEP added support for custom cloud textures -- flip them horizontally to match the preview of Clouds > Cloud Scroll
vary_texcoord0
=
vec2
(
-
texcoord0
.
x
,
texcoord0
.
y
);
// See: LLSettingsVOSky::applySpecial
vary_texcoord0
=
texcoord0
;
vary_texcoord0
.
xy
-=
0
.
5
;
vary_texcoord0
.
xy
/=
cloud_scale
;
vary_texcoord0
.
xy
+=
0
.
5
;
...
...
indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyF.glsl
View file @
8e91a4f6
...
...
@@ -42,9 +42,6 @@ VARYING vec4 vary_position;
uniform
samplerCube
environmentMap
;
// render_hud_attachments() -> HUD objects set LLShaderMgr::NO_ATMO; used in LLDrawPoolAlpha::beginRenderPass()
uniform
int
no_atmo
;
vec3
fullbrightShinyAtmosTransport
(
vec3
light
);
vec3
fullbrightAtmosTransportFrag
(
vec3
light
,
vec3
additive
,
vec3
atten
);
vec3
fullbrightScaleSoftClip
(
vec3
light
);
...
...
@@ -54,9 +51,7 @@ void calcAtmosphericVars(vec3 inPositionEye, vec3 light_dir, float ambFactor, ou
vec3
linear_to_srgb
(
vec3
c
);
vec3
srgb_to_linear
(
vec3
c
);
// See:
// class1\deferred\fullbrightShinyF.glsl
// class1\lighting\lightFullbrightShinyF.glsl
void
main
()
{
#ifdef HAS_DIFFUSE_LOOKUP
...
...
@@ -64,39 +59,25 @@ void main()
#else
vec4
color
=
texture2D
(
diffuseMap
,
vary_texcoord0
.
xy
);
#endif
color
.
rgb
*=
vertex_color
.
rgb
;
vec3
pos
=
vary_position
.
xyz
/
vary_position
.
w
;
// SL-9632 HUDs are affected by Atmosphere
if
(
no_atmo
==
0
)
{
vec3
sunlit
;
vec3
amblit
;
vec3
additive
;
vec3
atten
;
vec3
pos
=
vary_position
.
xyz
/
vary_position
.
w
;
calcAtmosphericVars
(
pos
.
xyz
,
vec3
(
0
),
1
.
0
,
sunlit
,
amblit
,
additive
,
atten
,
false
);
vec3
sunlit
;
vec3
amblit
;
vec3
additive
;
vec3
atten
;
vec3
envColor
=
textureCube
(
environmentMap
,
vary_texcoord1
.
xyz
).
rgb
;
float
env_intensity
=
vertex_color
.
a
;
calcAtmosphericVars
(
pos
.
xyz
,
vec3
(
0
),
1
.
0
,
sunlit
,
amblit
,
additive
,
atten
,
false
);
vec3
envColor
=
textureCube
(
environmentMap
,
vary_texcoord1
.
xyz
).
rgb
;
float
env_intensity
=
vertex_color
.
a
;
color
.
rgb
=
mix
(
color
.
rgb
,
envColor
.
rgb
,
env_intensity
);
//color.rgb = srgb_to_linear(color.rgb);
color
.
rgb
=
mix
(
color
.
rgb
,
envColor
.
rgb
,
env_intensity
);
color
.
rgb
=
fullbrightAtmosTransportFrag
(
color
.
rgb
,
additive
,
atten
);
color
.
rgb
=
fullbrightScaleSoftClip
(
color
.
rgb
);
}
/*
// NOTE: HUD objects will be full bright. Uncomment if you want "some" environment lighting effecting these HUD objects.
else
{
vec3 envColor = textureCube(environmentMap, vary_texcoord1.xyz).rgb;
float env_intensity = vertex_color.a;
color.rgb = mix(color.rgb, envColor.rgb, env_intensity);
}
*/
color
.
rgb
=
fullbrightAtmosTransportFrag
(
color
.
rgb
,
additive
,
atten
);
color
.
rgb
=
fullbrightScaleSoftClip
(
color
.
rgb
);
color
.
a
=
1
.
0
;
...
...
indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
View file @
8e91a4f6
...
...
@@ -340,11 +340,6 @@ void main()
if
(
spec
.
a
>
0
.
0
)
// specular reflection
{
/*#if 1 //EEP
/* // Reverting this specular calculation to previous 'dumbshiny' version - DJH 6/17/2020
// Preserving the refactored version as a comment for potential reconsideration,
// overriding the general rule to avoid pollutiong the source with commented code.
//
// If you're reading this in 2021+, feel free to obliterate.
vec3 npos = -normalize(pos.xyz);
...
...
@@ -385,23 +380,6 @@ void main()
color
=
mix
(
color
.
rgb
,
diffcol
.
rgb
,
diffuse
.
a
);