ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-27 17:25:48 +08:00
Code Issues Packages Projects Releases Wiki Activity
30,803 Commits 5 Branches 82 Tags
fa844d7e6ee88552d9095dc7a6330eeba767b3e9
Commit Graph

3464 Commits

Author SHA1 Message Date
ubit
ba6a2ec526 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-11 13:32:26 +02:00
Melanie
a6753c14a5 Revamp the v3 inventory sending. Uses threads and some nifty mechanics to 
leverage the Poll Service without blocking it's workers.
 2012-09-11 10:39:43 +02:00
Melanie
21c476228a Merge branch 'avination' into careminster 2012-09-10 13:53:00 +01:00
ubit
a2ace1b61a Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-10 02:27:26 +02:00
UbitUmarov
b7737b7273 webFetchInventory: change control event to simple flag, adjust locking 2012-09-10 01:20:34 +01:00
Melanie
657428a439 Remove commented code 2012-09-10 01:52:02 +02:00
ubit
b776aa1665 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-08 13:35:09 +02:00
UbitUmarov
a91ca984d5 llClientView: try to have only one thread per client processing 
RegionHandleRequests. (code assumes packet handle is called async as it is not)
 2012-09-08 12:22:40 +01:00
ubit
ed4ad93fef Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-04 11:53:04 +02:00
UbitUmarov
c298ae9e75 bug fix 2012-09-04 10:51:43 +01:00
ubit
a6bbaba7ef Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-04 08:42:15 +02:00
UbitUmarov
d4fad2ba42 a forgotten file plus minor changes. Imp and SL viewer seem to preserve 
flight. FS 4.2.2 does not.
 2012-09-04 07:32:03 +01:00
ubit
c93b2db9f2 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-01 03:12:10 +02:00
Melanie
1b15144208 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
 2012-08-31 01:32:18 +01:00
Melanie
68814f904e Replace SendBannedUserList with Avination's version. Untested in core. Not even test compiled. 2012-08-31 00:37:27 +01:00
Melanie
fd92560649 Merge branch 'avination' into careminster 2012-08-31 00:34:22 +01:00
ubit
194eb78b90 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-08-30 01:29:43 +02:00
Melanie
211f4fb411 Sequence inventory descendents requests to reduce inventory server load and 
movement lag.
 2012-08-30 00:34:12 +02:00
Melanie
74465df43f Fix issue with the quit packet being stuck int he queue and a one packet delay. 
Also fix semaphore excetion caused by enqueueing while dequque is taking place.
 2012-08-29 11:45:28 +02:00
Melanie
34f0694938 Remove Justin's addition to avoid sending incoming packets to inactive clients 
This also causes the initial AgentUpdate to be rejected because our processing
is asynchronous.
 2012-08-29 11:35:21 +02:00
Melanie
378a79e7cc Add a queue with two priority levels. This is a drop in replacement for 
the BlockingQueue from OMV, but allows two priorities.
 2012-08-28 22:17:17 +02:00
ubit
7a4dba2fdc Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-08-25 16:33:29 +02:00
Melanie
6d48dbf8ca Remove debug spam 2012-08-24 23:49:31 +02:00
Melanie
7e17f4296e Fix background inventory loading (Viewer 3) so it won't lag out the sim 2012-08-24 23:48:01 +02:00
Melanie
f8603a215d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/IClientAPI.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
	OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-08-23 01:41:47 +01:00
Melanie
5273b6880a Allow updates sent for right pec to go to the client 2012-08-21 21:20:20 +02:00
Justin Clark-Casey (justincc)
bcbd450fe4 Add --force flag to "kick user" console command to allow bypassing of recent race condition checks. 
This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once).
You should only attempt --force if a normal kick fails.
This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive.
This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
 2012-08-20 20:24:54 +01:00
Melanie
dd0556abc9 Fix llDialog responses so that they can be heard throughout the region. This now conforms to the behaviour in SL. 2012-08-19 22:05:38 +01:00
Melanie
0a959343a5 Make the console output from the reigon console hookable 2012-08-18 22:36:48 +02:00
ubit
d09fa0d76e Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-08-16 16:13:38 +02:00
Melanie
f6562e2269 Actually add the module 2012-08-14 22:22:25 +01:00
Melanie
f21fdff4f9 Actually add the module 2012-08-14 21:58:07 +02:00
Melanie
9b014a7167 Merge branch 'careminster' into avination 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
 2012-08-14 02:34:03 +01:00
ubit
dfb77330a8 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 
Conflicts:
	bin/lib32/BulletSim.dll
	bin/lib32/libBulletSim.so
	bin/lib64/BulletSim.dll
	bin/lib64/libBulletSim.so
 2012-08-04 11:42:59 +02:00
Melanie
b9c4a637b4 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-08-04 03:00:20 +01:00
Justin Clark-Casey (justincc)
205f2326dc Consolidate PersistBakedTextures, DelayBeforeAppearanceSend and DelayBeforeAppearanceSave into [Appearance] section from [Startup] config section so that all appearance settings are in the same place and not in the startup bucket. 
All these settings are in OpenSimDefaults.ini only.  If you are using them then please adjust your OpenSim.ini
 2012-08-03 23:02:39 +01:00
ubit
d259b6e57e Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-08-03 17:27:59 +02:00
ubit
0549dde3c6 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-08-03 16:22:34 +02:00
UbitUmarov
879d1cefb8 clientview IsActive use is broken. Suspend it's use keeping it true ( to 
review later)
 2012-08-03 15:19:31 +01:00
Melanie
b8ba224b4f Remove another superflouous IsActive set 2012-08-03 15:33:30 +02:00
Melanie
d677db338d Remove a merge artefaci in IsActive handling and restore commented out correct one 2012-08-03 15:22:53 +02:00
ubit
254d3e1ad3 merge crap gerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 
Conflicts:
	bin/Regions/Regions.ini.example
	bin/lib32/BulletSim.dll
	bin/lib32/libBulletSim.so
	bin/lib64/BulletSim.dll
	bin/lib64/libBulletSim.so
 2012-08-02 18:21:08 +02:00
Melanie
771d79e83e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Monitoring/BaseStatsCollector.cs
	OpenSim/Region/Application/OpenSim.cs
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs
	bin/OpenMetaverse.Rendering.Meshmerizer.dll
	bin/OpenMetaverse.StructuredData.dll
	bin/OpenMetaverse.dll
	bin/OpenMetaverseTypes.dll
	prebuild.xml
 2012-07-28 00:39:36 +01:00
Justin Clark-Casey (justincc)
35efa88c26 Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring. 
This better reflects the long-term purpose of that project and matches Monitoring modules.
 2012-07-25 23:11:50 +01:00
Justin Clark-Casey (justincc)
a1e99642c1 Add experimental "OpenSim object memory churn" statistics to output of region console "show stats" command 
This aims to capture the amount of memory that OpenSim turns over whilst operating a region.
This memory is not lost - apart from leaks it is reclaimed by the garbage collector.
However, the more memory that gets turned over the more work the GC has to do to reclaim it.
 2012-07-25 22:29:40 +01:00
Melanie
6930d696e9 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
 2012-07-25 18:19:12 +01:00
Justin Clark-Casey (justincc)
ef8570f789 Extend region console "show queues" command to show already collected time since last packeted received by the simulator from a viewer. 2012-07-24 23:39:31 +01:00
Melanie
112df30ea3 Merge branch 'avination' into careminster 2012-07-23 19:32:08 +01:00
ubit
23be64c132 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-23 20:18:07 +02:00
Melanie
b1b3057adc Fix double-ping on logout by not sending a stop packet to the client 
if the client told us it wants to log out in the first place.
 2012-07-21 20:56:19 +02:00