Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync with Upstream Alchemy

Browse Source 
Changes LLEnvManagerNew::setRegionChangeCallback to LLAgent::addRegionChangedCallback
Cleans up some of the timeout policies that aren't necessary any longer.
Modernizes parts of LLViewerKeyboard, updates llregistry.h
Begins changeover from LLDynamicArray to std::vector
Minor merge of newer, trivial SSA functions.
Introduces LLAgent functions: addParcelChangedCallback and canJoinGroups
Support for secondlife:///app/appearance SLapps.
Cleans up older functions.
This commit is contained in:
Inusaito Sayori
2014-09-04 17:23:23 -04:00
parent 1608ed43c1
commit 43a9aedf7d
45 changed files with 1035 additions and 971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/rlvui.cpp
View File

@@ -488,12 +488,12 @@ bool RlvUIEnabler::canViewParcelProperties()
const LLUUID& idOwner = pParcel->getOwnerID();
if ( (idOwner != gAgent.getID()) )
{
S32 count = gAgent.mGroups.count();
S32 count = gAgent.mGroups.size();
for (S32 i = 0; i < count; ++i)
{
if (gAgent.mGroups.get(i).mID == idOwner)
if (gAgent.mGroups[i].mID == idOwner)
{
fShow = ((gAgent.mGroups.get(i).mPowers & GP_LAND_RETURN) > 0);
fShow = ((gAgent.mGroups[i].mPowers & GP_LAND_RETURN) > 0);
break;
}
}