Merge https://github.com/PlayerDagostino/SingularityViewer into future
Conflicts: indra/llplugin/llplugininstance.cpp indra/llwindow/llwindowsdl.cpp indra/llwindow/llwindowsdl.h indra/newview/llpreviewnotecard.cpp indra/newview/llviewerwindow.h
This commit is contained in:
@@ -212,7 +212,7 @@
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>MediaFilterRect</key>
|
||||
<map>
|
||||
|
||||
Reference in New Issue
Block a user