aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorUbitUmarov2017-06-24 09:24:56 +0100
committerUbitUmarov2017-06-24 09:24:56 +0100
commit1a8a77c41e4061b75ff97fcf89e39717550bfa25 (patch)
tree325976c8554389b0b566db57eb71a6816ae15291 /bin
parentsimplify vectorrender background draw (diff)
downloadopensim-SC_OLD-1a8a77c41e4061b75ff97fcf89e39717550bfa25.zip
opensim-SC_OLD-1a8a77c41e4061b75ff97fcf89e39717550bfa25.tar.gz
opensim-SC_OLD-1a8a77c41e4061b75ff97fcf89e39717550bfa25.tar.bz2
opensim-SC_OLD-1a8a77c41e4061b75ff97fcf89e39717550bfa25.tar.xz
revert the thread level change; remove unused dynamic texture timer from internal code; let blend alpha work if < 255; let blend work with the selected face; etc
Diffstat (limited to 'bin')
-rw-r--r--bin/config-include/osslEnable.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
index 3538458..f9bfe03 100644
--- a/bin/config-include/osslEnable.ini
+++ b/bin/config-include/osslEnable.ini
@@ -121,6 +121,7 @@
121 Allow_osReplaceString = true 121 Allow_osReplaceString = true
122 Allow_osSetDynamicTextureData = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER 122 Allow_osSetDynamicTextureData = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
123 Allow_osSetDynamicTextureDataBlend = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER 123 Allow_osSetDynamicTextureDataBlend = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
124 Allow_osSetDynamicTextureDataBlendFace = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
124 Allow_osSetDynamicTextureURL = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER 125 Allow_osSetDynamicTextureURL = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
125 Allow_osSetDynamicTextureURLBlend = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER 126 Allow_osSetDynamicTextureURLBlend = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
126 Allow_osSetDynamicTextureURLBlendFace = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER 127 Allow_osSetDynamicTextureURLBlendFace = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
@@ -227,7 +228,6 @@
227 Allow_osGetNotecardLine = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER 228 Allow_osGetNotecardLine = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
228 Allow_osGetNumberOfNotecardLines = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER 229 Allow_osGetNumberOfNotecardLines = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
229 Allow_osRegionNotice = ESTATE_MANAGER,ESTATE_OWNER 230 Allow_osRegionNotice = ESTATE_MANAGER,ESTATE_OWNER
230 Allow_osSetDynamicTextureDataBlendFace = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
231 Allow_osSetRot = false 231 Allow_osSetRot = false
232 Allow_osSetParcelDetails = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER 232 Allow_osSetParcelDetails = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
233 233