diff options
author | Melanie | 2010-10-21 20:26:29 +0100 |
---|---|---|
committer | Melanie | 2010-10-21 20:26:29 +0100 |
commit | 28c4dd7931281f0b36a9d81cd17aef03057bcc39 (patch) | |
tree | 6ea6acd8f8bd636e5f5c82edc9cc0bacedb7aabc /OpenSim | |
parent | COnvert some funky K&R notation to proper (MS) style (diff) | |
parent | This fixes a delay in llSetLinkPrimitiveParamsFast (diff) | |
download | opensim-SC-28c4dd7931281f0b36a9d81cd17aef03057bcc39.zip opensim-SC-28c4dd7931281f0b36a9d81cd17aef03057bcc39.tar.gz opensim-SC-28c4dd7931281f0b36a9d81cd17aef03057bcc39.tar.bz2 opensim-SC-28c4dd7931281f0b36a9d81cd17aef03057bcc39.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim')
5 files changed, 5 insertions, 14 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index fff4300..e5cf0dc 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -3453,7 +3453,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3453 | 3453 | ||
3454 | avp.Sender.IsTrial = false; | 3454 | avp.Sender.IsTrial = false; |
3455 | avp.Sender.ID = agentID; | 3455 | avp.Sender.ID = agentID; |
3456 | m_log.DebugFormat("[CLIENT]: Sending appearance for {0} to {1}", agentID.ToString(), AgentId.ToString()); | 3456 | //m_log.DebugFormat("[CLIENT]: Sending appearance for {0} to {1}", agentID.ToString(), AgentId.ToString()); |
3457 | OutPacket(avp, ThrottleOutPacketType.Task); | 3457 | OutPacket(avp, ThrottleOutPacketType.Task); |
3458 | } | 3458 | } |
3459 | 3459 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 48ae4ca..4b24ba2 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -617,8 +617,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
617 | StatsReporter.OnSendStatsResult += SendSimStatsPackets; | 617 | StatsReporter.OnSendStatsResult += SendSimStatsPackets; |
618 | StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats; | 618 | StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats; |
619 | 619 | ||
620 | StatsReporter.SetObjectCapacity(RegionInfo.ObjectCapacity); | ||
621 | |||
622 | // Old | 620 | // Old |
623 | /* | 621 | /* |
624 | m_simulatorVersion = simulatorVersion | 622 | m_simulatorVersion = simulatorVersion |
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs index fd23294..87dcdee 100644 --- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs +++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | |||
@@ -108,7 +108,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
108 | private int m_activeScripts = 0; | 108 | private int m_activeScripts = 0; |
109 | private int m_scriptLinesPerSecond = 0; | 109 | private int m_scriptLinesPerSecond = 0; |
110 | 110 | ||
111 | private int objectCapacity = 45000; | 111 | private int m_objectCapacity = 45000; |
112 | 112 | ||
113 | private Scene m_scene; | 113 | private Scene m_scene; |
114 | 114 | ||
@@ -124,6 +124,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
124 | m_scene = scene; | 124 | m_scene = scene; |
125 | ReportingRegion = scene.RegionInfo; | 125 | ReportingRegion = scene.RegionInfo; |
126 | 126 | ||
127 | m_objectCapacity = scene.RegionInfo.ObjectCapacity; | ||
127 | m_report.AutoReset = true; | 128 | m_report.AutoReset = true; |
128 | m_report.Interval = statsUpdatesEveryMS; | 129 | m_report.Interval = statsUpdatesEveryMS; |
129 | m_report.Elapsed += new ElapsedEventHandler(statsHeartBeat); | 130 | m_report.Elapsed += new ElapsedEventHandler(statsHeartBeat); |
@@ -271,7 +272,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
271 | 272 | ||
272 | SimStats simStats | 273 | SimStats simStats |
273 | = new SimStats( | 274 | = new SimStats( |
274 | ReportingRegion.RegionLocX, ReportingRegion.RegionLocY, regionFlags, (uint)objectCapacity, rb, sb, m_scene.RegionInfo.originRegionID); | 275 | ReportingRegion.RegionLocX, ReportingRegion.RegionLocY, regionFlags, (uint)m_objectCapacity, rb, sb, m_scene.RegionInfo.originRegionID); |
275 | 276 | ||
276 | handlerSendStatResult = OnSendStatsResult; | 277 | handlerSendStatResult = OnSendStatsResult; |
277 | if (handlerSendStatResult != null) | 278 | if (handlerSendStatResult != null) |
@@ -435,11 +436,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
435 | m_activeScripts = count; | 436 | m_activeScripts = count; |
436 | } | 437 | } |
437 | 438 | ||
438 | public void SetObjectCapacity(int objects) | ||
439 | { | ||
440 | objectCapacity = objects; | ||
441 | } | ||
442 | |||
443 | /// <summary> | 439 | /// <summary> |
444 | /// This is for llGetRegionFPS | 440 | /// This is for llGetRegionFPS |
445 | /// </summary> | 441 | /// </summary> |
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index 7e1b5ac..b84a34d 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | |||
@@ -83,7 +83,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
83 | 83 | ||
84 | // private int m_stipend = 1000; | 84 | // private int m_stipend = 1000; |
85 | 85 | ||
86 | // private int ObjectCapacity = 45000; | ||
87 | private int ObjectCount = 0; | 86 | private int ObjectCount = 0; |
88 | private int PriceEnergyUnit = 0; | 87 | private int PriceEnergyUnit = 0; |
89 | private int PriceGroupCreate = 0; | 88 | private int PriceGroupCreate = 0; |
@@ -135,7 +134,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
135 | 134 | ||
136 | public void AddRegion(Scene scene) | 135 | public void AddRegion(Scene scene) |
137 | { | 136 | { |
138 | // Send ObjectCapacity to Scene.. Which sends it to the SimStatsReporter. | ||
139 | if (m_enabled) | 137 | if (m_enabled) |
140 | { | 138 | { |
141 | scene.RegisterModuleInterface<IMoneyModule>(this); | 139 | scene.RegisterModuleInterface<IMoneyModule>(this); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 296a50e..f55bd12 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -7251,7 +7251,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7251 | 7251 | ||
7252 | public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules) | 7252 | public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules) |
7253 | { | 7253 | { |
7254 | m_host.AddScriptLPS(1); | 7254 | m_host.AddScriptLPS(1); |
7255 | 7255 | ||
7256 | List<SceneObjectPart> parts = GetLinkParts(linknumber); | 7256 | List<SceneObjectPart> parts = GetLinkParts(linknumber); |
7257 | List<ScenePresence> avatars = GetLinkAvatars(linknumber); | 7257 | List<ScenePresence> avatars = GetLinkAvatars(linknumber); |
@@ -7318,7 +7318,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7318 | break; | 7318 | break; |
7319 | } | 7319 | } |
7320 | } | 7320 | } |
7321 | |||
7322 | } | 7321 | } |
7323 | 7322 | ||
7324 | protected void SetPrimParams(SceneObjectPart part, LSL_List rules) | 7323 | protected void SetPrimParams(SceneObjectPart part, LSL_List rules) |