Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
XDG Integration
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
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
JennaHuntsman
XDG Integration
Commits
30df481c
Commit
30df481c
authored
3 years ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
SL-16644 OUT_FULL updates should reset cache
parent
07358a4f
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
indra/newview/llviewerobjectlist.cpp
+1
-1
1 addition, 1 deletion
indra/newview/llviewerobjectlist.cpp
indra/newview/llviewerregion.cpp
+3
-11
3 additions, 11 deletions
indra/newview/llviewerregion.cpp
indra/newview/llviewerregion.h
+1
-1
1 addition, 1 deletion
indra/newview/llviewerregion.h
with
5 additions
and
13 deletions
indra/newview/llviewerobjectlist.cpp
+
1
−
1
View file @
30df481c
...
...
@@ -580,7 +580,7 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
if
(
update_cache
)
{
objectp
=
regionp
->
updateCacheEntry
(
local_id
,
objectp
,
update_type
);
objectp
=
regionp
->
updateCacheEntry
(
local_id
,
objectp
);
}
// This looks like it will break if the local_id of the object doesn't change
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llviewerregion.cpp
+
3
−
11
View file @
30df481c
...
...
@@ -1783,13 +1783,8 @@ LLViewerObject* LLViewerRegion::addNewObject(LLVOCacheEntry* entry)
//update object cache if the object receives a full-update or terse update
//update_type == EObjectUpdateType::OUT_TERSE_IMPROVED or EObjectUpdateType::OUT_FULL
LLViewerObject
*
LLViewerRegion
::
updateCacheEntry
(
U32
local_id
,
LLViewerObject
*
objectp
,
U32
update_type
)
LLViewerObject
*
LLViewerRegion
::
updateCacheEntry
(
U32
local_id
,
LLViewerObject
*
objectp
)
{
if
(
objectp
&&
update_type
!=
(
U32
)
OUT_TERSE_IMPROVED
)
{
return
objectp
;
//no need to access cache
}
LLVOCacheEntry
*
entry
=
getCacheEntry
(
local_id
);
if
(
!
entry
)
{
...
...
@@ -1801,11 +1796,8 @@ LLViewerObject* LLViewerRegion::updateCacheEntry(U32 local_id, LLViewerObject* o
objectp
=
addNewObject
(
entry
);
}
//remove from cache if terse update
if
(
update_type
==
(
U32
)
OUT_TERSE_IMPROVED
)
{
killCacheEntry
(
entry
,
true
);
}
//remove from cache.
killCacheEntry
(
entry
,
true
);
return
objectp
;
}
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llviewerregion.h
+
1
−
1
View file @
30df481c
...
...
@@ -353,7 +353,7 @@ class LLViewerRegion final : public LLCapabilityProvider // implements this inte
void
requestCacheMisses
();
void
addCacheMissFull
(
const
U32
local_id
);
//update object cache if the object receives a full-update or terse update
LLViewerObject
*
updateCacheEntry
(
U32
local_id
,
LLViewerObject
*
objectp
,
U32
update_type
);
LLViewerObject
*
updateCacheEntry
(
U32
local_id
,
LLViewerObject
*
objectp
);
void
findOrphans
(
U32
parent_id
);
void
clearCachedVisibleObjects
();
void
dumpCache
();
...
...
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