Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Alchemy
Alchemy Next
Commits
13821018
Commit
13821018
authored
Sep 06, 2021
by
Xenny Heartsong
Committed by
Rye Mutt
Sep 06, 2021
Browse files
Elevate #RLV back to being a system folder
parent
3efe88a1
Changes
5
Hide whitespace changes
Inline
Side-by-side
indra/llinventory/llfoldertype.cpp
View file @
13821018
...
...
@@ -104,7 +104,9 @@ LLFolderDictionary::LLFolderDictionary()
addEntry
(
LLFolderType
::
FT_SUITCASE
,
new
FolderEntry
(
"suitcase"
,
TRUE
));
addEntry
(
LLFolderType
::
FT_ANIM_OVERRIDES
,
new
FolderEntry
(
"animover"
,
TRUE
));
addEntry
(
LLFolderType
::
FT_RLV
,
new
FolderEntry
(
"rlv"
,
TRUE
));
addEntry
(
LLFolderType
::
FT_NONE
,
new
FolderEntry
(
"-1"
,
FALSE
));
};
...
...
indra/llinventory/llfoldertype.h
View file @
13821018
...
...
@@ -97,6 +97,7 @@ class LLFolderType
FT_ANIM_OVERRIDES
,
FT_TOXIC
,
FT_RLV
,
FT_COUNT
,
...
...
indra/newview/llinventorybridge.cpp
View file @
13821018
...
...
@@ -3517,6 +3517,8 @@ LLFolderType::EType LLFolderBridge::getPreferredType() const
else
if
(
cat_name
==
"#Firestorm"
||
cat_name
==
"#Phoenix"
||
cat_name
==
"#DV3"
||
cat_name
==
"#Kokua"
)
preferred_type
=
LLFolderType
::
FT_TOXIC
;
else
if
(
cat_name
==
RLV_ROOT_FOLDER
)
preferred_type
=
LLFolderType
::
FT_RLV
;
else
preferred_type
=
cat
->
getPreferredType
();
}
...
...
indra/newview/llviewerfoldertype.cpp
View file @
13821018
...
...
@@ -149,6 +149,7 @@ LLViewerFolderDictionary::LLViewerFolderDictionary()
addEntry
(
LLFolderType
::
FT_NONE
,
new
ViewerFolderEntry
(
"New Folder"
,
"Inv_FolderOpen"
,
"Inv_FolderClosed"
,
FALSE
,
false
,
"default"
));
addEntry
(
LLFolderType
::
FT_TOXIC
,
new
ViewerFolderEntry
(
"Firstorm"
,
"Inv_FolderOpenToxic"
,
"Inv_FolderClosedToxic"
,
FALSE
,
false
));
addEntry
(
LLFolderType
::
FT_RLV
,
new
ViewerFolderEntry
(
"RlvRoot"
,
"Inv_SysOpen"
,
"Inv_SysClosed"
,
FALSE
,
false
));
for
(
U32
type
=
(
U32
)
LLFolderType
::
FT_ENSEMBLE_START
;
type
<=
(
U32
)
LLFolderType
::
FT_ENSEMBLE_END
;
++
type
)
{
...
...
indra/newview/skins/default/xui/en/strings.xml
View file @
13821018
...
...
@@ -3868,6 +3868,8 @@ Abuse Report</string>
<string
name=
"Other Gestures"
>
Other Gestures
</string>
<string
name=
"Speech Gestures"
>
Speech Gestures
</string>
<string
name=
"Common Gestures"
>
Common Gestures
</string>
<!-- Additional inventory entries -->
<string
name=
"RlvRoot"
>
#RLV
</string>
<!-- gestures -->
<string
name=
"Male - Excuse me"
>
Male - Excuse me
</string>
<string
name=
"Male - Get lost"
>
Male - Get lost
</string>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment