aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2019-08-07 17:58:55 +0100
committerMelanie2019-08-07 17:58:55 +0100
commitba680ceecba3dd07fc794a7a2c2a77b2dc9471df (patch)
tree0a64eefac9de3746e78c1116b2858d577133773f /bin
parentFix scope support to get friends list names across co-hosted grids (diff)
parentcap EstateAccess: don't meed with keepAlive unless needed (diff)
downloadopensim-SC-ba680ceecba3dd07fc794a7a2c2a77b2dc9471df.zip
opensim-SC-ba680ceecba3dd07fc794a7a2c2a77b2dc9471df.tar.gz
opensim-SC-ba680ceecba3dd07fc794a7a2c2a77b2dc9471df.tar.bz2
opensim-SC-ba680ceecba3dd07fc794a7a2c2a77b2dc9471df.tar.xz
Merge branch 'master' of brain.opensimulator.org:/var/git/opensim
Diffstat (limited to 'bin')
-rwxr-xr-xbin/OpenMetaverse.Rendering.Meshmerizer.dllbin20480 -> 20480 bytes
-rwxr-xr-xbin/OpenMetaverse.StructuredData.dllbin106496 -> 110592 bytes
-rwxr-xr-xbin/OpenMetaverse.dllbin2179072 -> 2183168 bytes
-rwxr-xr-xbin/OpenMetaverseTypes.dllbin114688 -> 114688 bytes
-rw-r--r--bin/OpenSimDefaults.ini1
-rw-r--r--bin/ScriptSyntax.xml25
6 files changed, 21 insertions, 5 deletions
diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
index 53e9600..2d0aa08 100755
--- a/bin/OpenMetaverse.Rendering.Meshmerizer.dll
+++ b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
Binary files differ
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index f9c8c4f..eb96d19 100755
--- a/bin/OpenMetaverse.StructuredData.dll
+++ b/bin/OpenMetaverse.StructuredData.dll
Binary files differ
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 02edd6c..4728719 100755
--- a/bin/OpenMetaverse.dll
+++ b/bin/OpenMetaverse.dll
Binary files differ
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index befbcf2..a3f65d2 100755
--- a/bin/OpenMetaverseTypes.dll
+++ b/bin/OpenMetaverseTypes.dll
Binary files differ
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 1332ce8..9c53b93 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -771,6 +771,7 @@
771 Cap_ChatSessionRequest = "" 771 Cap_ChatSessionRequest = ""
772 Cap_CopyInventoryFromNotecard = "localhost" 772 Cap_CopyInventoryFromNotecard = "localhost"
773 Cap_DispatchRegionInfo = "" 773 Cap_DispatchRegionInfo = ""
774 Cap_EstateAccess = "localhost"
774 Cap_EstateChangeInfo = "" 775 Cap_EstateChangeInfo = ""
775 Cap_EnvironmentSettings = "localhost" 776 Cap_EnvironmentSettings = "localhost"
776 Cap_EventQueueGet = "localhost" 777 Cap_EventQueueGet = "localhost"
diff --git a/bin/ScriptSyntax.xml b/bin/ScriptSyntax.xml
index 2282ada..34cd1cc 100644
--- a/bin/ScriptSyntax.xml
+++ b/bin/ScriptSyntax.xml
@@ -1,4 +1,4 @@
124121ec8-c0a3-099d-8d83-64feaa32418c 1d2556181-baf5-e5b9-c8ec-99eda597b9f6
2<llsd><map><key>llsd-lsl-syntax-version</key><integer>2</integer> 2<llsd><map><key>llsd-lsl-syntax-version</key><integer>2</integer>
3<key>controls</key> 3<key>controls</key>
4<map> 4<map>
@@ -1513,7 +1513,7 @@
1513 </map> 1513 </map>
1514 <key>OS_APIVERSION</key><map> 1514 <key>OS_APIVERSION</key><map>
1515 <key>type</key><string>integer</string> 1515 <key>type</key><string>integer</string>
1516 <key>value</key><string>4</string> 1516 <key>value</key><string>5</string>
1517 </map> 1517 </map>
1518 <key>OS_ATTACH_MSG_ALL</key><map> 1518 <key>OS_ATTACH_MSG_ALL</key><map>
1519 <key>type</key><string>integer</string> 1519 <key>type</key><string>integer</string>
@@ -1665,6 +1665,10 @@
1665 <key>type</key><string>integer</string> 1665 <key>type</key><string>integer</string>
1666 <key>value</key><string>1</string> 1666 <key>value</key><string>1</string>
1667 </map> 1667 </map>
1668 <key>PARCEL_DETAILS_DWELL</key><map>
1669 <key>type</key><string>integer</string>
1670 <key>value</key><string>64</string>
1671 </map>
1668 <key>PARCEL_DETAILS_GROUP</key><map> 1672 <key>PARCEL_DETAILS_GROUP</key><map>
1669 <key>type</key><string>integer</string> 1673 <key>type</key><string>integer</string>
1670 <key>value</key><string>3</string> 1674 <key>value</key><string>3</string>
@@ -3017,6 +3021,10 @@
3017 <key>type</key><string>integer</string> 3021 <key>type</key><string>integer</string>
3018 <key>value</key><string>1</string> 3022 <key>value</key><string>1</string>
3019 </map> 3023 </map>
3024 <key>VEHICLE_FLAG_NO_FLY_UP</key><map>
3025 <key>type</key><string>integer</string>
3026 <key>value</key><string>1</string>
3027 </map>
3020 <key>VEHICLE_FLAG_NO_X</key><map> 3028 <key>VEHICLE_FLAG_NO_X</key><map>
3021 <key>type</key><string>integer</string> 3029 <key>type</key><string>integer</string>
3022 <key>value</key><string>1024</string> 3030 <key>value</key><string>1024</string>
@@ -6665,6 +6673,13 @@
6665 <map><key>name</key><map><key>type</key><string>string</string></map></map> 6673 <map><key>name</key><map><key>type</key><string>string</string></map></map>
6666 </array> 6674 </array>
6667 </map> 6675 </map>
6676 <key>osGetParcelDwell</key>
6677 <map>
6678 <key>return</key><string>integer</string>
6679 <key>arguments</key><array>
6680 <map><key>pos</key><map><key>type</key><string>vector</string></map></map>
6681 </array>
6682 </map>
6668 <key>osGetPhysicsEngineName</key> 6683 <key>osGetPhysicsEngineName</key>
6669 <map> 6684 <map>
6670 <key>return</key><string>string</string> 6685 <key>return</key><string>string</string>
@@ -7581,7 +7596,6 @@
7581 <key>arguments</key><array> 7596 <key>arguments</key><array>
7582 <map><key>src</key><map><key>type</key><string>string</string></map></map> 7597 <map><key>src</key><map><key>type</key><string>string</string></map></map>
7583 <map><key>start</key><map><key>type</key><string>integer</string></map></map> 7598 <map><key>start</key><map><key>type</key><string>integer</string></map></map>
7584 <map><key>length</key><map><key>type</key><string>integer</string></map></map>
7585 </array> 7599 </array>
7586 </map> 7600 </map>
7587 <key>osStringSubString</key> 7601 <key>osStringSubString</key>
@@ -7590,6 +7604,7 @@
7590 <key>arguments</key><array> 7604 <key>arguments</key><array>
7591 <map><key>src</key><map><key>type</key><string>string</string></map></map> 7605 <map><key>src</key><map><key>type</key><string>string</string></map></map>
7592 <map><key>start</key><map><key>type</key><string>integer</string></map></map> 7606 <map><key>start</key><map><key>type</key><string>integer</string></map></map>
7607 <map><key>length</key><map><key>type</key><string>integer</string></map></map>
7593 </array> 7608 </array>
7594 </map> 7609 </map>
7595 <key>osSunGetParam</key> 7610 <key>osSunGetParam</key>
@@ -7619,6 +7634,8 @@
7619 <map> 7634 <map>
7620 <key>arguments</key><array> 7635 <key>arguments</key><array>
7621 <map><key>agent</key><map><key>type</key><string>string</string></map></map> 7636 <map><key>agent</key><map><key>type</key><string>string</string></map></map>
7637 <map><key>regionX</key><map><key>type</key><string>integer</string></map></map>
7638 <map><key>regionY</key><map><key>type</key><string>integer</string></map></map>
7622 <map><key>position</key><map><key>type</key><string>vector</string></map></map> 7639 <map><key>position</key><map><key>type</key><string>vector</string></map></map>
7623 <map><key>lookat</key><map><key>type</key><string>vector</string></map></map> 7640 <map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
7624 </array> 7641 </array>
@@ -7627,8 +7644,6 @@
7627 <map> 7644 <map>
7628 <key>arguments</key><array> 7645 <key>arguments</key><array>
7629 <map><key>agent</key><map><key>type</key><string>string</string></map></map> 7646 <map><key>agent</key><map><key>type</key><string>string</string></map></map>
7630 <map><key>regionX</key><map><key>type</key><string>integer</string></map></map>
7631 <map><key>regionY</key><map><key>type</key><string>integer</string></map></map>
7632 <map><key>position</key><map><key>type</key><string>vector</string></map></map> 7647 <map><key>position</key><map><key>type</key><string>vector</string></map></map>
7633 <map><key>lookat</key><map><key>type</key><string>vector</string></map></map> 7648 <map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
7634 </array> 7649 </array>
generated by cgit v1.1 at 2025-04-06 16:39:41 +0000