aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CONTRIBUTORS.txt346
-rw-r--r--OpenSim/Data/MySQL/MySQLInventoryData.cs3
-rw-r--r--OpenSim/Framework/Util.cs20
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs13
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs10
7 files changed, 226 insertions, 173 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 0d78928..08048f5 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -1,173 +1,173 @@
1The following people have contributed to OpenSim (Thank you 1The following people have contributed to OpenSim (Thank you
2for your effort!) 2for your effort!)
3 3
4Add your name in here if you have committed to OpenSim 4Add your name in here if you have committed to OpenSim
5 5
6= Current OpenSim Developers (in very rough order of appearance) = 6= Current OpenSim Developers (in very rough order of appearance) =
7These folks represent the current core team for OpenSim, and are the 7These folks represent the current core team for OpenSim, and are the
8people that make the day to day of OpenSim happen. 8people that make the day to day of OpenSim happen.
9 9
10* MW (Tribal Media AB) 10* MW (Tribal Media AB)
11* Adam Frisby (DeepThink Pty Ltd) 11* Adam Frisby (DeepThink Pty Ltd)
12* MingChen (DeepThink Pty Ltd) 12* MingChen (DeepThink Pty Ltd)
13* lbsa71 (Tribal Media AB) 13* lbsa71 (Tribal Media AB)
14* Sean Dague / sdague (IBM) 14* Sean Dague / sdague (IBM)
15* Tedd 15* Tedd
16* justincc 16* justincc
17* Teravus (w3z) 17* Teravus (w3z)
18* Johan Berntsson (3Di) 18* Johan Berntsson (3Di)
19* Ckrinke (Charles Krinke) 19* Ckrinke (Charles Krinke)
20* chi11ken (Genkii) 20* chi11ken (Genkii)
21* adjohn (Genkii) 21* adjohn (Genkii)
22* Dr Scofield aka Dirk Husemann (IBM Research - Zurich) 22* Dr Scofield aka Dirk Husemann (IBM Research - Zurich)
23* dahlia 23* dahlia
24* mikem (3Di) 24* mikem (3Di)
25* Melanie Thielker 25* Melanie Thielker
26* Homer_Horwitz 26* Homer_Horwitz
27* idb (Ian Brown) 27* idb (Ian Brown)
28* Diva (Crista Lopes, University of California, Irvine) 28* Diva (Crista Lopes, University of California, Irvine)
29* nlin (3Di) 29* nlin (3Di)
30* Arthur Rodrigo S Valadares (IBM) 30* Arthur Rodrigo S Valadares (IBM)
31 31
32 32
33= Past Open Sim Developers = 33= Past Open Sim Developers =
34These folks are alumns of the OpenSim core group, but are now 34These folks are alumns of the OpenSim core group, but are now
35currently not active. Their great contributions helped get us to 35currently not active. Their great contributions helped get us to
36where we are today. 36where we are today.
37 37
38* Gareth 38* Gareth
39* Andy- 39* Andy-
40* MorphW 40* MorphW
41* CW 41* CW
42* Babblefrog 42* Babblefrog
43* Danx0r 43* Danx0r
44* Dalien 44* Dalien
45* Darok 45* Darok
46* Alondria 46* Alondria
47 47
48 48
49= Additional OpenSim Contributors = 49= Additional OpenSim Contributors =
50These folks have contributed code patches to OpenSim to help make it 50These folks have contributed code patches to OpenSim to help make it
51what it is today. 51what it is today.
52 52
53* aduffy70 53* aduffy70
54* A_Biondi 54* A_Biondi
55* alex_carnell 55* alex_carnell
56* Alan Webb (IBM) 56* Alan Webb (IBM)
57* BigFootAg 57* BigFootAg
58* BlueWall Slade 58* BlueWall Slade
59* brianw/Sir_Ahzz 59* brianw/Sir_Ahzz
60* CharlieO 60* CharlieO
61* ChrisDown 61* ChrisDown
62* Chris Yeoh (IBM) 62* Chris Yeoh (IBM)
63* coyled 63* coyled
64* Daedius 64* Daedius
65* Dong Jun Lan (IBM) 65* Dong Jun Lan (IBM)
66* DoranZemlja 66* DoranZemlja
67* daTwitch 67* daTwitch
68* devalnor-#708 68* devalnor-#708
69* dmiles (Daxtron Labs) 69* dmiles (Daxtron Labs)
70* dslake (Intel) 70* dslake (Intel)
71* FredoChaplin 71* FredoChaplin
72* Gerhard 72* Gerhard
73* Godfrey 73* Godfrey
74* Grumly57 74* Grumly57
75* Ewe Loon 75* Ewe Loon
76* Fly-Man 76* Fly-Man
77* Flyte Xevious 77* Flyte Xevious
78* Imaze Rhiano 78* Imaze Rhiano
79* Intimidated 79* Intimidated
80* Jeremy Bongio (IBM) 80* Jeremy Bongio (IBM)
81* jhurliman 81* jhurliman
82* John R Sohn (XenReborn) 82* John R Sohn (XenReborn)
83* jonc 83* jonc
84* Junta Kohime 84* Junta Kohime
85* Kayne 85* Kayne
86* Kevin Cozens 86* Kevin Cozens
87* kinoc (Daxtron Labs) 87* kinoc (Daxtron Labs)
88* Kitto Flora 88* Kitto Flora
89* KittyLiu 89* KittyLiu
90* Kurt Taylor (IBM) 90* Kurt Taylor (IBM)
91* lulurun 91* lulurun
92* M.Igarashi 92* M.Igarashi
93* maimedleech 93* maimedleech
94* Mic Bowman 94* Mic Bowman
95* Michelle Argus 95* Michelle Argus
96* Michael Cortez (The Flotsam Project, http://osflotsam.org/) 96* Michael Cortez (The Flotsam Project, http://osflotsam.org/)
97* Mike Osias (IBM) 97* Mike Osias (IBM)
98* Mike Pitman (IBM) 98* Mike Pitman (IBM)
99* mikkopa/_someone - RealXtend 99* mikkopa/_someone - RealXtend
100* Misterblue (Intel) 100* Misterblue (Intel)
101* Mircea Kitsune 101* Mircea Kitsune
102* mpallari 102* mpallari
103* nornalbion 103* nornalbion
104* Omar Vera Ustariz (IBM) 104* Omar Vera Ustariz (IBM)
105* openlifegrid.com 105* openlifegrid.com
106* otakup0pe 106* otakup0pe
107* ralphos 107* ralphos
108* RemedyTomm 108* RemedyTomm
109* Revolution 109* Revolution
110* Richard Alimi (IBM) 110* Richard Alimi (IBM)
111* Rick Alther (IBM) 111* Rick Alther (IBM)
112* Rob Smart (IBM) 112* Rob Smart (IBM)
113* rtomita 113* rtomita
114* Ruud Lathorp 114* Ruud Lathorp
115* SachaMagne 115* SachaMagne
116* Salahzar Stenvaag 116* Salahzar Stenvaag
117* sempuki 117* sempuki
118* Snoopy 118* Snoopy
119* Strawberry Fride 119* Strawberry Fride
120* tglion 120* tglion
121* tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud) 121* tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud)
122* tyre 122* tyre
123* Vytek 123* Vytek
124* webmage (IBM) 124* webmage (IBM)
125* Xantor 125* Xantor
126* Y. Nitta 126* Y. Nitta
127* YZh 127* YZh
128* Zackary Geers aka Kunnis Basiat 128* Zackary Geers aka Kunnis Basiat
129* Zha Ewry 129* Zha Ewry
130 130
131 131
132= LSL Devs = 132= LSL Devs =
133 133
134* Alondria 134* Alondria
135* CharlieO 135* CharlieO
136* Tedd 136* Tedd
137* Melanie Thielker 137* Melanie Thielker
138 138
139 139
140= Testers = 140= Testers =
141 141
142* Ai Austin 142* Ai Austin
143* CharlieO (LSL) 143* CharlieO (LSL)
144* Ckrinke 144* Ckrinke
145* openlifegrid.com 145* openlifegrid.com
146 146
147 147
148This software uses components from the following developers: 148This software uses components from the following developers:
149* Sleepycat Software (Berkeley DB) 149* Sleepycat Software (Berkeley DB)
150* SQLite (Public Domain) 150* SQLite (Public Domain)
151* XmlRpcCS (http://xmlrpccs.sf.net/) 151* XmlRpcCS (http://xmlrpccs.sf.net/)
152* MySQL, Inc. (MySQL Connector/NET) 152* MySQL, Inc. (MySQL Connector/NET)
153* NUnit (http://www.nunit.org) 153* NUnit (http://www.nunit.org)
154* AGEIA Inc. (PhysX) 154* AGEIA Inc. (PhysX)
155* Russel L. Smith (ODE) 155* Russel L. Smith (ODE)
156* Prebuild (http://sourceforge.net/projects/dnpb/) 156* Prebuild (http://sourceforge.net/projects/dnpb/)
157* LibOpenMetaverse (http://lib.openmetaverse.org/) 157* LibOpenMetaverse (http://lib.openmetaverse.org/)
158* DotNetOpenMail v0.5.8b (http://dotnetopenmail.sourceforge.net) 158* DotNetOpenMail v0.5.8b (http://dotnetopenmail.sourceforge.net)
159* Prototype JavaScript Framework ajax (http://www.prototypejs.org/) 159* Prototype JavaScript Framework ajax (http://www.prototypejs.org/)
160* C5 GENERIC COLLECTION LIBRARY FOR C#/CLI 160* C5 GENERIC COLLECTION LIBRARY FOR C#/CLI
161* Nini (http://nini.sourceforge.net/) 161* Nini (http://nini.sourceforge.net/)
162* log4net (http://logging.apache.org/log4net/) 162* log4net (http://logging.apache.org/log4net/)
163* GlynnTucker.Cache (http://gtcache.sourceforge.net/) 163* GlynnTucker.Cache (http://gtcache.sourceforge.net/)
164* NDesk.Options 0.2.1 (http://www.ndesk.org/Options) 164* NDesk.Options 0.2.1 (http://www.ndesk.org/Options)
165 165
166Some plugins are based on Cable Beach 166Some plugins are based on Cable Beach
167Cable Beach is Copyright (c) 2008 Intel Corporation 167Cable Beach is Copyright (c) 2008 Intel Corporation
168see http://forge.opensimulator.org/gf/project/assetserver/ 168see http://forge.opensimulator.org/gf/project/assetserver/
169 169
170In addition, we would like to thank: 170In addition, we would like to thank:
171* The Mono Project 171* The Mono Project
172* The NANT Developers 172* The NANT Developers
173* Microsoft (.NET, MSSQL-Adapters) 173* Microsoft (.NET, MSSQL-Adapters)
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index 0ea0cb7..d560c5f 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -91,6 +91,9 @@ namespace OpenSim.Data.MySQL
91 rollbackStore = GridDataMySqlFile.ParseFileReadValue("rollback") == "true"; 91 rollbackStore = GridDataMySqlFile.ParseFileReadValue("rollback") == "true";
92 opengridmode = GridDataMySqlFile.ParseFileReadValue("opengridmode") == "true"; 92 opengridmode = GridDataMySqlFile.ParseFileReadValue("opengridmode") == "true";
93 93
94 if(rollbackStore)
95 m_log.Warn("[MysqlInventory] Enabling rollback mode in: " + rollbackDir);
96
94 database = 97 database =
95 new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, 98 new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling,
96 settingPort); 99 settingPort);
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 1112497..7215086 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1007,6 +1007,26 @@ namespace OpenSim.Framework
1007 return os; 1007 return os;
1008 } 1008 }
1009 1009
1010 public static string GetRuntimeInformation()
1011 {
1012 string ru = String.Empty;
1013
1014 if (Environment.OSVersion.Platform == PlatformID.Unix)
1015 ru = "Unix/Mono";
1016 else
1017 if (Environment.OSVersion.Platform == PlatformID.MacOSX)
1018 ru = "OSX/Mono";
1019 else
1020 {
1021 if (Type.GetType("Mono.Runtime") != null)
1022 ru = "Win/Mono";
1023 else
1024 ru = "Win/.NET";
1025 }
1026
1027 return ru;
1028 }
1029
1010 /// <summary> 1030 /// <summary>
1011 /// Is the given string a UUID? 1031 /// Is the given string a UUID?
1012 /// </summary> 1032 /// </summary>
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index a22fb5f..cc13972 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -574,10 +574,15 @@ namespace OpenSim.Region.Framework.Scenes
574 574
575 StatsReporter.SetObjectCapacity(objectCapacity); 575 StatsReporter.SetObjectCapacity(objectCapacity);
576 576
577 // Old
578 /*
577 m_simulatorVersion = simulatorVersion 579 m_simulatorVersion = simulatorVersion
578 + " (OS " + Util.GetOperatingSystemInformation() + ")" 580 + " (OS " + Util.GetOperatingSystemInformation() + ")"
579 + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() 581 + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString()
580 + " PhysPrim:" + m_physicalPrim.ToString(); 582 + " PhysPrim:" + m_physicalPrim.ToString();
583 */
584
585 m_simulatorVersion = simulatorVersion + " (" + Util.GetRuntimeInformation() + ")";
581 586
582 try 587 try
583 { 588 {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 5501679..e9e54ae 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1970,5 +1970,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1970 return ret; 1970 return ret;
1971 } 1971 }
1972 1972
1973 public int osGetSimulatorMemory()
1974 {
1975 CheckThreatLevel(ThreatLevel.Moderate, "osGetRegionStats");
1976 m_host.AddScriptLPS(1);
1977 long pws = System.Diagnostics.Process.GetCurrentProcess().WorkingSet64;
1978
1979 if (pws > Int32.MaxValue)
1980 return Int32.MaxValue;
1981 if (pws < 0)
1982 return 0;
1983
1984 return (int)pws;
1985 }
1973 } 1986 }
1974} 1987}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 0b0dc00..580c354 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -163,5 +163,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
163 key osGetMapTexture(); 163 key osGetMapTexture();
164 key osGetRegionMapTexture(string regionName); 164 key osGetRegionMapTexture(string regionName);
165 LSL_List osGetRegionStats(); 165 LSL_List osGetRegionStats();
166
167 int osGetSimulatorMemory();
166 } 168 }
167} 169}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 519463e..2876ad6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -637,5 +637,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
637 { 637 {
638 return m_OSSL_Functions.osGetRegionStats(); 638 return m_OSSL_Functions.osGetRegionStats();
639 } 639 }
640
641 /// <summary>
642 /// Returns the amount of memory in use by the Simulator Daemon.
643 /// Amount in bytes - if >= 4GB, returns 4GB. (LSL is not 64-bit aware)
644 /// </summary>
645 /// <returns></returns>
646 public LSL_Integer osGetSimulatorMemory()
647 {
648 return m_OSSL_Functions.osGetSimulatorMemory();
649 }
640 } 650 }
641} 651}
generated by cgit v1.1 at 2024-11-04 21:23:49 +0000