Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Releases
- Package registry
- Terraform modules

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

f9b13d8f

Commit f9b13d8f authored 14 years ago by David Parks

Downloads
- Patches
- Plain Diff

Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of merge fixes.

parent c2da9f5d

No related branches found

No related tags found

Loading

Changes 33

Hide whitespace changes

Inline Side-by-side

Showing

indra/llcommon/llassettype.cpp 2 additions, 1 deletion

indra/llcommon/llassettype.cpp
indra/llcommon/llassettype.h 2 additions, 1 deletion

indra/llcommon/llassettype.h
indra/llinventory/llinventorytype.cpp 4 additions, 1 deletion

indra/llinventory/llinventorytype.cpp
indra/llinventory/llinventorytype.h 2 additions, 0 deletions

indra/llinventory/llinventorytype.h
indra/llmath/llvolume.cpp 8 additions, 5 deletions

indra/llmath/llvolume.cpp
indra/llmath/llvolume.h 7 additions, 0 deletions

indra/llmath/llvolume.h
indra/llrender/llvertexbuffer.cpp 2 additions, 2 deletions

indra/llrender/llvertexbuffer.cpp
indra/llvfs/llvfs.cpp 2 additions, 0 deletions

indra/llvfs/llvfs.cpp
indra/newview/app_settings/settings.xml 2 additions, 2 deletions

indra/newview/app_settings/settings.xml
indra/newview/llappviewer.cpp 4 additions, 0 deletions

indra/newview/llappviewer.cpp
indra/newview/llassetuploadresponders.cpp 5 additions, 0 deletions

indra/newview/llassetuploadresponders.cpp
indra/newview/llassetuploadresponders.h 2 additions, 1 deletion

indra/newview/llassetuploadresponders.h
indra/newview/lldrawpoolavatar.cpp 46 additions, 2 deletions

indra/newview/lldrawpoolavatar.cpp
indra/newview/lldrawpoolavatar.h 24 additions, 16 deletions

indra/newview/lldrawpoolavatar.h
indra/newview/llface.cpp 2 additions, 0 deletions

indra/newview/llface.cpp
indra/newview/llinventorybridge.cpp 9 additions, 1 deletion

indra/newview/llinventorybridge.cpp
indra/newview/llinventorybridge.h 2 additions, 2 deletions

indra/newview/llinventorybridge.h
indra/newview/llpanelgroupnotices.cpp 2 additions, 0 deletions

indra/newview/llpanelgroupnotices.cpp
indra/newview/llpanelobjectinventory.cpp 6 additions, 0 deletions

indra/newview/llpanelobjectinventory.cpp
indra/newview/llselectmgr.cpp 2 additions, 0 deletions

indra/newview/llselectmgr.cpp

with 135 additions and 34 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment