Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
cfcc31c4
Commit
cfcc31c4
authored
9 years ago
by
andreykproductengine
Browse files
Options
Downloads
Patches
Plain Diff
MAINT-5570 additional comments, extended functionality of some variables
parent
47dfdff3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/llavatarrendernotifier.cpp
+17
-16
17 additions, 16 deletions
indra/newview/llavatarrendernotifier.cpp
indra/newview/llavatarrendernotifier.h
+6
-2
6 additions, 2 deletions
indra/newview/llavatarrendernotifier.h
with
23 additions
and
18 deletions
indra/newview/llavatarrendernotifier.cpp
+
17
−
16
View file @
cfcc31c4
...
@@ -62,8 +62,8 @@ mLatestAgentComplexity(0),
...
@@ -62,8 +62,8 @@ mLatestAgentComplexity(0),
mLatestOverLimitPct
(
0.0
f
),
mLatestOverLimitPct
(
0.0
f
),
mShowOverLimitAgents
(
false
),
mShowOverLimitAgents
(
false
),
mNotifyOutfitLoading
(
false
),
mNotifyOutfitLoading
(
false
),
m
Initial
CofVersion
(
-
1
),
m
Last
CofVersion
(
-
1
),
m
InitialO
tfitRezStatus
(
-
1
),
m
LastOu
tfitRezStatus
(
-
1
),
mLastSkeletonSerialNum
(
-
1
)
mLastSkeletonSerialNum
(
-
1
)
{
{
mPopUpDelayTimer
.
resetWithExpiry
(
OVER_LIMIT_UPDATE_DELAY
);
mPopUpDelayTimer
.
resetWithExpiry
(
OVER_LIMIT_UPDATE_DELAY
);
...
@@ -189,24 +189,32 @@ void LLAvatarRenderNotifier::updateNotificationState()
...
@@ -189,24 +189,32 @@ void LLAvatarRenderNotifier::updateNotificationState()
return
;
return
;
}
}
if
(
mInitialCofVersion
<
0
// Don't use first provided COF and Sceleton versions - let them load anf 'form' first
if
(
mLastCofVersion
<
0
&&
gAgentWearables
.
areWearablesLoaded
()
&&
gAgentWearables
.
areWearablesLoaded
()
&&
LLAttachmentsMgr
::
getInstance
()
->
isAttachmentStateComplete
())
&&
LLAttachmentsMgr
::
getInstance
()
->
isAttachmentStateComplete
())
{
{
// cof formed
// cof formed
m
Initial
CofVersion
=
LLAppearanceMgr
::
instance
().
getCOFVersion
();
m
Last
CofVersion
=
LLAppearanceMgr
::
instance
().
getCOFVersion
();
mLastSkeletonSerialNum
=
gAgentAvatarp
->
mLastSkeletonSerialNum
;
mLastSkeletonSerialNum
=
gAgentAvatarp
->
mLastSkeletonSerialNum
;
}
}
else
if
(
mLastCofVersion
>=
0
if
(
gAgentAvatarp
->
mLastRezzedStatus
>=
mInitialOtfitRezStatus
)
&&
(
mLastCofVersion
!=
gAgentAvatarp
->
mLastUpdateRequestCOFVersion
||
mLastSkeletonSerialNum
!=
gAgentAvatarp
->
mLastSkeletonSerialNum
))
{
{
mInitialOtfitRezStatus
=
gAgentAvatarp
->
mLastRezzedStatus
;
// version mismatch in comparison to previous outfit - outfit changed
mNotifyOutfitLoading
=
true
;
mLastCofVersion
=
LLAppearanceMgr
::
instance
().
getCOFVersion
();
mLastSkeletonSerialNum
=
gAgentAvatarp
->
mLastSkeletonSerialNum
;
}
}
else
if
(
gAgentAvatarp
->
mLastRezzedStatus
<
mLastOutfitRezStatus
)
{
{
// rez status decreased - outfit related action was initiated
// rez status decreased - outfit related action was initiated
mNotifyOutfitLoading
=
true
;
mNotifyOutfitLoading
=
true
;
}
}
mLastOutfitRezStatus
=
gAgentAvatarp
->
mLastRezzedStatus
;
}
}
void
LLAvatarRenderNotifier
::
updateNotificationAgent
(
U32
agentComplexity
)
void
LLAvatarRenderNotifier
::
updateNotificationAgent
(
U32
agentComplexity
)
{
{
...
@@ -224,14 +232,7 @@ void LLAvatarRenderNotifier::updateNotificationAgent(U32 agentComplexity)
...
@@ -224,14 +232,7 @@ void LLAvatarRenderNotifier::updateNotificationAgent(U32 agentComplexity)
// We should not notify about initial outfit and it's load process without reason
// We should not notify about initial outfit and it's load process without reason
updateNotificationState
();
updateNotificationState
();
if
(
mInitialCofVersion
>=
0
if
(
mLatestOverLimitAgents
>
0
)
&&
(
mInitialCofVersion
!=
gAgentAvatarp
->
mLastUpdateRequestCOFVersion
||
mLastSkeletonSerialNum
!=
gAgentAvatarp
->
mLastSkeletonSerialNum
))
{
// version mismatch in comparison to initial outfit - outfit changed
mNotifyOutfitLoading
=
true
;
}
else
if
(
mLatestOverLimitAgents
>
0
)
{
{
// Some users can't see agent already, notify user about complexity growth
// Some users can't see agent already, notify user about complexity growth
mNotifyOutfitLoading
=
true
;
mNotifyOutfitLoading
=
true
;
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llavatarrendernotifier.h
+
6
−
2
View file @
cfcc31c4
...
@@ -72,9 +72,13 @@ class LLAvatarRenderNotifier : public LLSingleton<LLAvatarRenderNotifier>
...
@@ -72,9 +72,13 @@ class LLAvatarRenderNotifier : public LLSingleton<LLAvatarRenderNotifier>
// initial outfit related variables (state control)
// initial outfit related variables (state control)
bool
mNotifyOutfitLoading
;
bool
mNotifyOutfitLoading
;
S32
mInitialCofVersion
;
S32
mInitialOtfitRezStatus
;
// COF (inventory folder) and Skeleton (voavatar) are used to spot changes in outfit.
S32
mLastCofVersion
;
S32
mLastSkeletonSerialNum
;
S32
mLastSkeletonSerialNum
;
// Used to detect changes in voavatar's rezzed status.
// If value decreases - there were changes in outfit.
S32
mLastOutfitRezStatus
;
};
};
#endif
/* ! defined(LL_llavatarrendernotifier_H) */
#endif
/* ! defined(LL_llavatarrendernotifier_H) */
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment