ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'avination' into careminster

Browse Source 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
	OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
This commit is contained in:
Melanie
2012-07-06 20:51:18 +01:00
parent 5776351f6a ce7864632b
commit 26d89777d8
19 changed files with 585 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@@ -592,12 +592,12 @@ namespace OpenSim.Region.Framework.Scenes
protected internal void AddPhysicalPrim(int number)
{
m_physicalPrim++;
m_physicalPrim += number;
}
protected internal void RemovePhysicalPrim(int number)
{
m_physicalPrim--;
m_physicalPrim -= number;
}
protected internal void AddToScriptLPS(int number)