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

13
indra/newview/rlvdefines.h
View File

@@ -151,6 +151,7 @@ enum ERlvBehaviour {
RLV_BHVR_SHOWWORLDMAP, // "showworldmap"
RLV_BHVR_SHOWLOC, // "showloc"
RLV_BHVR_SHOWNAMES, // "shownames"
RLV_BHVR_SHOWNAMETAGS, // "shownametags"
RLV_BHVR_SHOWHOVERTEXT, // "showhovertext"
RLV_BHVR_SHOWHOVERTEXTHUD, // "showhovertexthud"
RLV_BHVR_SHOWHOVERTEXTWORLD, // "showhovertextworld"
@@ -205,6 +206,18 @@ enum ERlvBehaviour {
RLV_BHVR_DETACHALLTHIS, // "detachallthis"
RLV_BHVR_DETACHALLTHISEXCEPT, // "detachallthis_except"
RLV_BHVR_ADJUSTHEIGHT, // "adjustheight"
RLV_BHVR_CAMZOOMMAX, // "camzoommax"
RLV_BHVR_CAMZOOMMIN, // "camzoommin"
RLV_BHVR_CAMDISTMAX, // "camdistmax"
RLV_BHVR_CAMDISTMIN, // "camdistmin"
RLV_BHVR_CAMDRAWMAX, // "camdrawmax"
RLV_BHVR_CAMDRAWMIN, // "camdrawmin"
RLV_BHVR_CAMDRAWALPHAMAX, // "camdrawalphamax"
RLV_BHVR_CAMDRAWALPHAMIN, // "camdrawalphamin"
RLV_BHVR_CAMDRAWCOLOR, // "camdrawcolor"
RLV_BHVR_CAMUNLOCK, // "camunlock"
RLV_BHVR_CAMAVDIST, // "camavdist"
RLV_BHVR_CAMTEXTURES, // "camtextures"
RLV_BHVR_TPTO, // "tpto"
RLV_BHVR_VERSION, // "version"
RLV_BHVR_VERSIONNEW, // "versionnew"