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
1a974f22
Commit
1a974f22
authored
10 years ago
by
callum_linden
Browse files
Options
Downloads
Patches
Plain Diff
Update to build on Xcode 6.0: typedef declared protected incorrectly here
parent
42cb9e65
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/llappearance/llwearable.h
+3
-3
3 additions, 3 deletions
indra/llappearance/llwearable.h
with
3 additions
and
3 deletions
indra/llappearance/llwearable.h
+
3
−
3
View file @
1a974f22
...
...
@@ -113,6 +113,9 @@ class LLWearable
// Update the baked texture hash.
virtual
void
addToBakedTextureHash
(
LLMD5
&
hash
)
const
=
0
;
typedef
std
::
map
<
S32
,
LLVisualParam
*>
visual_param_index_map_t
;
visual_param_index_map_t
mVisualParamIndexMap
;
protected
:
typedef
std
::
map
<
S32
,
LLLocalTextureObject
*>
te_map_t
;
void
syncImages
(
te_map_t
&
src
,
te_map_t
&
dst
);
...
...
@@ -132,9 +135,6 @@ class LLWearable
typedef
std
::
map
<
S32
,
F32
>
param_map_t
;
param_map_t
mSavedVisualParamMap
;
// last saved version of visual params
typedef
std
::
map
<
S32
,
LLVisualParam
*>
visual_param_index_map_t
;
visual_param_index_map_t
mVisualParamIndexMap
;
te_map_t
mTEMap
;
// maps TE to LocalTextureObject
te_map_t
mSavedTEMap
;
// last saved version of TEMap
};
...
...
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