Merge branch 'main' into marchcat/slua-26.2

# Conflicts:
#	indra/llfilesystem/lldir.cpp
#	indra/llfilesystem/llfilesystem.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/lltexturecache.cpp
#	indra/newview/llvoiceclient.cpp
#	indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp
index b941d356a1..0852258994 100644
--- a/indra/newview/llvoicechannel.cpp
+++ b/indra/newview/llvoicechannel.cpp
@@ -472,10 +472,6 @@ void LLVoiceChannelGroup::activate()
                 }
             }
         }
-
-        // Mic default state is OFF on initiating/joining Ad-Hoc/Group calls.  It's on for P2P using the AdHoc infra.
-
-        LLVoiceClient::getInstance()->setUserPTTState(mIsP2P);
     }
 }
 
@@ -534,6 +530,10 @@ void LLVoiceChannelGroup::handleStatusChange(EStatusType type)
     case STATUS_JOINED:
         mRetries = 3;
         mIsRetrying = false;
+
+        // Mic default state is OFF on initiating/joining Ad-Hoc/Group calls. It's on for P2P using the AdHoc infra.
+        LLVoiceClient::getInstance()->setUserPTTState(mIsP2P);
+        break;
     default:
         break;
     }