Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion indra/llmessage/llcachename.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,10 @@ bool LLCacheName::getFullName(const LLUUID& id, std::string& fullname)
return res;
}


bool LLCacheName::getFirstLastName(const LLUUID& id, std::string& first, std::string& last)
{
return impl.getName(id, first, last, mCacheName);
}

bool LLCacheName::getGroupName(const LLUUID& id, std::string& group)
{
Expand Down
3 changes: 3 additions & 0 deletions indra/llmessage/llcachename.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ class LLCacheName
// Returns true if available.
bool getFullName(const LLUUID& id, std::string& full_name);

// Returns first name, last name
bool getFirstLastName(const LLUUID& id, std::string& first, std::string& last);

// Reverse lookup of UUID from name
bool getUUID(const std::string& first, const std::string& last, LLUUID& id);
bool getUUID(const std::string& fullname, LLUUID& id);
Expand Down
2 changes: 2 additions & 0 deletions indra/newview/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ set(viewer_SOURCE_FILES
llfloatermediasettings.cpp
llfloatermemleak.cpp
llfloatermodelpreview.cpp
llfloatermoderation.cpp
llfloatermodeluploadbase.cpp
llfloatermyscripts.cpp
llfloatermyenvironment.cpp
Expand Down Expand Up @@ -936,6 +937,7 @@ set(viewer_HEADER_FILES
llfloatermediasettings.h
llfloatermemleak.h
llfloatermodelpreview.h
llfloatermoderation.h
llfloatermodeluploadbase.h
llfloatermyscripts.h
llfloatermyenvironment.h
Expand Down
19 changes: 17 additions & 2 deletions indra/newview/app_settings/message.xml
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,19 @@
<key>trusted-sender</key>
<boolean>false</boolean>
</map>
<!-- Server to client -->

<key>SpatialVoiceModerationRequest</key>
<map>
<key>flavor</key>
<string>llsd</string>
<key>trusted-sender</key>
<boolean>false</boolean>
</map>




<!-- Server to client -->
<key>RequiredVoiceVersion</key>
<map>
<key>flavor</key>
Expand Down Expand Up @@ -698,7 +710,10 @@

<key>VoiceSignalingRequest</key>
<boolean>false</boolean>


<key>SpatialVoiceModerationRequest</key>
<boolean>false</boolean>

<key>RemoteParcelRequest</key>
<boolean>false</boolean>

Expand Down
Loading