Merge commit 'a1edba6'

Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.cpp

@@ -717,7 +717,7 @@ plArmatureMod *plAvatarMgr::GetFirstRemoteAvatar()
     return nil;
 }
 
-plArmatureMod* plAvatarMgr::FindAvatar(plKey& avatarKey)
+plArmatureMod* plAvatarMgr::FindAvatar(const plKey& avatarKey)
 {
     plSceneObject *so = plSceneObject::ConvertNoRef(avatarKey->ObjectIsLoaded());
     if (so)

Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h

@@ -141,7 +141,7 @@ public:
 
     plArmatureMod *GetLocalAvatar();
     plKey GetLocalAvatarKey();
-    static plArmatureMod *FindAvatar(plKey& avatarKey); // Key of the sceneObject
+    static plArmatureMod *FindAvatar(const plKey& avatarKey); // Key of the sceneObject
     plArmatureMod *FindAvatarByPlayerID(uint32_t pid);
     plArmatureMod *FindAvatarByModelName(const plString& name); // Probably only useful for custom NPCs. All players are
                                                       // either "Male" or "Female".

Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.cpp

@@ -273,7 +273,7 @@ void plLinkEffectsTriggerMsg::WriteVersion(hsStream* s, hsResMgr* mgr)
     mgr->WriteKey(s, fLinkInAnimKey);
 }
 
-void plLinkEffectsTriggerMsg::SetLinkKey(plKey &key)
+void plLinkEffectsTriggerMsg::SetLinkKey(const plKey &key)
 {
     fLinkKey = key; 
 }
@@ -430,4 +430,4 @@ void plPseudoLinkAnimCallbackMsg::Write(hsStream* stream, hsResMgr* mgr)
 {
     plMessage::IMsgWrite(stream,mgr);
     mgr->WriteKey(stream, fAvatarKey);
-}
+}

Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.h

@@ -149,7 +149,7 @@ public:
     void    SetLeavingAge(bool leaving) { fLeavingAge = leaving; }
     bool    IsLeavingAge() { return fLeavingAge; }
 
-    void    SetLinkKey(plKey &key);
+    void    SetLinkKey(const plKey &key);
     const plKey GetLinkKey() const { return fLinkKey; }
 
     void    SetLinkInAnimKey(plKey &key);

Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.h

@@ -42,6 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plNetServerSessionInfo_h_inc
 #define plNetServerSessionInfo_h_inc
 
+#include <string>
 #include "HeadSpin.h"
 
 #include "pnFactory/plCreatable.h"

Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.h

@@ -236,7 +236,7 @@ class plProgressMgr
 
         static plProgressMgr* GetInstance() { return fManager; }
         static const plString GetLoadingFrameID(int index);
-        uint32_t plProgressMgr::NumLoadingFrames() const;
+        uint32_t NumLoadingFrames() const;
         static const plString GetStaticTextID(StaticText staticTextType);
 
         virtual void    Draw( plPipeline *p ) { }

Sources/Plasma/PubUtilLib/plSockets/plSocket.cpp

@@ -151,7 +151,7 @@ bool plSocket::IsBlocking()
 #ifdef BSDBLOCK
 #error "BSDBLOCK: TODO: IsBlocking() for bsd."
 #else
-    int ans = plNet::Ioctl(fSocket,FIONBIO,NULL);
+    int ans = plNet::Ioctl(fSocket,FIONBIO,nullptr);
     return (ans!=0);
 #endif
 }
@@ -208,4 +208,4 @@ int plSocket::IGetTimeOutsFromSocket()
         fSendTimeOut = stimeoutval;
     }
     return 0;
-}
+}

Sources/Plasma/PubUtilLib/plVault/plVaultClientApi.cpp

@@ -2790,7 +2790,7 @@ bool VaultRegisterOwnedAgeAndWait (const plAgeLinkStruct * link) {
             }
             
             if (IS_NET_ERROR(param.result)) {
-                LogMsg(kLogError, L"RegisterOwnedAge: Failed to init age %S", link->GetAgeInfo()->GetAgeFilename());
+                LogMsg(kLogError, "RegisterOwnedAge: Failed to init age %s", link->GetAgeInfo()->GetAgeFilename().c_str());
                 break;
             }
                 
@@ -3164,7 +3164,7 @@ bool VaultRegisterVisitAgeAndWait (const plAgeLinkStruct * link) {
             }
             
             if (IS_NET_ERROR(param.result)) {
-                LogMsg(kLogError, L"RegisterVisitAge: Failed to init age %S", link->GetAgeInfo()->GetAgeFilename());
+                LogMsg(kLogError, "RegisterVisitAge: Failed to init age %s", link->GetAgeInfo()->GetAgeFilename().c_str());
                 break;
             }
                 
@@ -4436,7 +4436,7 @@ bool VaultAgeFindOrCreateSubAgeLinkAndWait (
         }
         
         if (IS_NET_ERROR(param.result)) {
-            LogMsg(kLogError, L"CreateSubAge: Failed to init age %S", link->GetAgeInfo()->GetAgeFilename());
+            LogMsg(kLogError, "CreateSubAge: Failed to init age %s", link->GetAgeInfo()->GetAgeFilename().c_str());
             return false;
         }
             
@@ -4794,7 +4794,7 @@ bool VaultAgeFindOrCreateChildAgeLinkAndWait (
         }
         
         if (IS_NET_ERROR(param.result)) {
-            LogMsg(kLogError, L"CreateChildAge: Failed to init age %S", link->GetAgeInfo()->GetAgeFilename());
+            LogMsg(kLogError, "CreateChildAge: Failed to init age %s", link->GetAgeInfo()->GetAgeFilename().c_str());
             return false;
         }