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

Merge branch 'master' into AISv3-WIP

Browse Source 
Conflicts:
	indra/newview/llinventorybridge.cpp
This commit is contained in:
Shyotl
2015-06-27 01:30:28 -05:00
parent a380161283 1e488fef6d
commit 3f3ead0988
108 changed files with 1129 additions and 675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/rlvcommon.h
View File

@@ -57,7 +57,7 @@ typedef std::list<RlvCommand> rlv_command_list_t;
class RlvObject;
struct RlvException;
typedef boost::variant<std::string, LLUUID, S32, ERlvBehaviour> RlvExceptionOption;
typedef boost::variant<std::string, LLUUID, S32, F32, LLColor3, ERlvBehaviour> RlvExceptionOption;
class RlvGCTimer;