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

Merge branch 'master' of https://github.com/siana/SingularityViewer

Browse Source 
Added missing header to indra/newview/ascentkeyword.cpp now that
llviewerpluginmanager.h has a couple of header dependencies less.

Resolved Conflicts:
	indra/llcommon/CMakeLists.txt

Proximity: addition of two independent things. Just included both.
This commit is contained in:
Aleric Inglewood
2011-05-13 23:55:06 +02:00
parent ea2cc3e0de ea31271ac1
commit 41f13dbf46
36 changed files with 647 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloatercustomize.h
View File

@@ -131,7 +131,7 @@ protected:
LLScrollingPanelList* mScrollingPanelList;
LLScrollableContainerView* mScrollContainer;
LLVisualParamReset* mResetParams;
LLPointer<LLVisualParamReset> mResetParams;
LLInventoryObserver* mInventoryObserver;