aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorUbitUmarov2019-11-13 18:44:58 +0000
committerUbitUmarov2019-11-13 18:44:58 +0000
commit5d2ffdc35bf17188443e930f4dec8222e6b1430c (patch)
tree8c5e51907ce52c61cb218895c4dc8a4a524cc8e6 /OpenSim/Region/ClientStack
parentReduce Max region size to 4096m (diff)
downloadopensim-SC-5d2ffdc35bf17188443e930f4dec8222e6b1430c.zip
opensim-SC-5d2ffdc35bf17188443e930f4dec8222e6b1430c.tar.gz
opensim-SC-5d2ffdc35bf17188443e930f4dec8222e6b1430c.tar.bz2
opensim-SC-5d2ffdc35bf17188443e930f4dec8222e6b1430c.tar.xz
limit max number of attachments to 38. All can be on same point
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index 08c2b38..c1030ae 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -164,7 +164,6 @@ namespace OpenSim.Region.ClientStack.Linden
164 m_features["BakesOnMeshEnabled"] = true; 164 m_features["BakesOnMeshEnabled"] = true;
165 165
166 m_features["PhysicsMaterialsEnabled"] = true; 166 m_features["PhysicsMaterialsEnabled"] = true;
167
168 OSDMap typesMap = new OSDMap(); 167 OSDMap typesMap = new OSDMap();
169 typesMap["convex"] = true; 168 typesMap["convex"] = true;
170 typesMap["none"] = true; 169 typesMap["none"] = true;
@@ -175,10 +174,14 @@ namespace OpenSim.Region.ClientStack.Linden
175 m_features["LSLSyntaxId"] = OSD.FromUUID(m_scriptSyntaxID); 174 m_features["LSLSyntaxId"] = OSD.FromUUID(m_scriptSyntaxID);
176 175
177 OSDMap meshAnim = new OSDMap(); 176 OSDMap meshAnim = new OSDMap();
178 meshAnim["AnimatedObjectMaxTris"] = OSD.FromInteger(10000); 177 meshAnim["AnimatedObjectMaxTris"] = OSD.FromInteger(150000);
179 meshAnim["MaxAgentAnimatedObjectAttachments"] = OSD.FromInteger(2); 178 meshAnim["MaxAgentAnimatedObjectAttachments"] = OSD.FromInteger(2);
180 m_features["AnimatedObjects"] = meshAnim; 179 m_features["AnimatedObjects"] = meshAnim;
181 180
181 m_features["MaxAgentAttachments"] = OSD.FromInteger(Constants.MaxAgentAttachments);
182 m_features["MaxAgentGroupsBasic"] = OSD.FromInteger(Constants.MaxAgentGroups);
183 m_features["MaxAgentGroupsPremium"] = OSD.FromInteger(Constants.MaxAgentGroups);
184
182 // Extra information for viewers that want to use it 185 // Extra information for viewers that want to use it
183 // TODO: Take these out of here into their respective modules, like map-server-url 186 // TODO: Take these out of here into their respective modules, like map-server-url
184 OSDMap extrasMap; 187 OSDMap extrasMap;