ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-21 07:05:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,907 Commits 5 Branches 87 Tags
2bdd3eb918cede60290905974ea26d2bbd7d5187
Commit Graph

3873 Commits

Author SHA1 Message Date
Melanie
3c1a58c67a Merge branch 'master' into careminster 2012-11-22 13:37:27 +00:00
Justin Clark-Casey (justincc)
3ce00e97cc Factor out command script code. 
This also allows comments in command scripts (lines starting with ;, # or //) to be used across all servers
 2012-11-22 05:57:20 +00:00
Justin Clark-Casey (justincc)
9fcf3f1a3f Make "config show/set/get/save" console commands available on all servers 2012-11-22 05:48:41 +00:00
Justin Clark-Casey (justincc)
8269d2b893 Factor out common pid file creation and removal code. 
Log path at which pid file is created or reason for failure to create.
 2012-11-22 05:14:43 +00:00
Justin Clark-Casey (justincc)
42e87a6582 Add "get log level" command - this returns the current server session console logging level. 
This supersedes getting information by calling "set log level" without a 4th argument, which is confusing.
 2012-11-22 04:57:45 +00:00
Justin Clark-Casey (justincc)
34ff96a119 Remove unused BaseOpenSimServer.ShowHelp() 2012-11-22 04:52:29 +00:00
Justin Clark-Casey (justincc)
4c4379b50f Make "set log level" command available across all servers 2012-11-22 04:50:09 +00:00
Justin Clark-Casey (justincc)
45d1e6ab09 Make "show info" command available across all servers 
This helpfully lists version information, startup location and console log level
 2012-11-22 04:45:53 +00:00
Justin Clark-Casey (justincc)
cf03d6ea92 Factor out common registration of "show uptime" command 2012-11-22 04:11:03 +00:00
Justin Clark-Casey (justincc)
5c48d7a378 factor out common HandleShow code for "show uptime" 2012-11-22 04:05:09 +00:00
Justin Clark-Casey (justincc)
74a20a62ee refactor: Factor out copy/pasted server uptime report code 2012-11-22 03:43:21 +00:00
Melanie
5f4ac1c5a3 Merge branch 'master' into careminster 2012-11-22 03:40:30 +00:00
Melanie
45eedb635a Merge branch 'master' into careminster 2012-11-20 20:25:15 +00:00
Justin Clark-Casey (justincc)
dc5711ad62 minor: If logging full incoming HTTP data, don't deceptively print ... at the end of the body. 2012-11-20 04:10:03 +00:00
Melanie
decc5318a7 Merge branch 'avination' into careminster 2012-11-20 01:21:15 +00:00
Melanie
ccc81183b0 Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
 2012-11-20 01:20:59 +00:00
teravus
5e0294815f * Plumbing and basic setting of the GetMesh Cap Throttler. 
* Last step is to flip the throttle distribution.
 2012-11-17 03:47:09 -05:00
Melanie
7ad082f7c3 Merge branch 'avination' into careminster 2012-11-17 02:58:14 +00:00
Melanie
e4659a83f1 Merge branch 'master' into careminster 2012-11-17 02:03:24 +00:00
Justin Clark-Casey (justincc)
392e84e554 Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuid 
This was necessary historically but hasn't been for many years.
Can still get CreatorIdAsUuid, which is really just a UUID cached version of the string CreatorId
 2012-11-17 01:23:29 +00:00
Justin Clark-Casey (justincc)
55f889cc66 refactor: Move stat classes out of StatManager and into their own files for clarity. 2012-11-16 05:02:06 +00:00
Justin Clark-Casey (justincc)
cd088757e9 Add a first draft mechanism for the IncomingPacketsProcessedStat to show the delta over time. 
The chief motivation for this is to be able to tell whether there's any impact on incoming packet processing from enabling extra packet pooling.
 2012-11-16 04:36:22 +00:00
teravus
e9153e1d1a Revert "Merge master into teravuswork", it should have been avination, not master. 
This reverts commit dfac269032, reversing
changes made to 619c39e514.
 2012-11-15 10:05:16 -05:00
teravus
dfac269032 Merge master into teravuswork 2012-11-15 09:46:41 -05:00
Melanie
5895c4cc6f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
 2012-11-15 03:46:10 +00:00
Justin Clark-Casey (justincc)
038528dc80 Make PacketPool class stats pull stats instead of push stats so they can be lifted up into LLUDPServer and be distiguished by scene name 2012-11-15 02:02:59 +00:00
Melanie
06fa1681ae Merge branch 'master' into careminster 2012-11-15 00:43:26 +00:00
Diva Canto
27b12cebbb A few more AssemblyInfos in a few more dlls. 2012-11-14 08:10:15 -08:00
Diva Canto
e4cb7af98a Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't have an AssemblyInfo file. 2012-11-13 19:26:43 -08:00
teravus
cda127e30f * Prep work switching the GetMeshModule over to a poll service. 
* This still has the image throttler in it..  as is...  so it's not suitable for live yet.... The throttler keeps track of the task throttle but doesn't balance the UDP throttle yet.
 2012-11-09 23:55:30 -05:00
teravus
4fa088bafb Pipe Throttle Update Event to EventManager, client --> ScenePresence --> EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule. 2012-11-04 22:57:24 -05:00
Melanie
a2c6094324 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/TaskInventoryItem.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
 2012-10-31 21:42:06 +00:00
Justin Clark-Casey (justincc)
6235d16c31 Make "show object part" command correctly display script status. 
Uses new IEntityInventory.TryGetScriptInstanceRunning()
Makes it clearer that TaskInventoryItem.ScriptRunning cannot be used as it is temporary and not updated.
 2012-10-31 00:31:18 +00:00
Melanie
28a4ea73ea Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/ChildAgentDataUpdate.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-10-31 00:13:33 +00:00
Melanie
9e05067a4f Add AnimState to CADU 2012-10-30 22:11:02 +00:00
Melanie
ff61d59e60 Add AnimState to CADU 2012-10-30 21:45:39 +01:00
Melanie
48569e856a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-10-30 01:02:20 +00:00
SignpostMarv
56965dd959 fixing poorly-formatted xml doc string for Util.IsInsideBox 2012-10-29 23:39:00 +00:00
Justin Clark-Casey (justincc)
c97890ca69 Add "force gc" region console command which manually invokes garbage collection. 
For debugging purposes.
 2012-10-29 22:53:06 +00:00
Melanie
26cc57b6ca Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
 2012-10-26 21:13:01 +01:00
Justin Clark-Casey (justincc)
c13a99dc5c Fix script error messages not showing up in viewer 3 and associated viewers. 
Viewer 3 will discard such a message if the chat message owner does not match the avatar.
We were filling the ownerID with the primID, so this never matched, hence viewer 3 did not see any script error messages.
This commit fills the ownerID in with the prim ownerID so the script owner will receive script error messages.
This does not affect viewer 1 and associated viewers which continue to process script errors as normal.
 2012-10-25 03:26:12 +01:00
Justin Clark-Casey (justincc)
5d4ac5a90f Add TestOsNpcLoadAppearance() 2012-10-25 00:59:27 +01:00
Justin Clark-Casey (justincc)
81aeecc907 Allow "show object", "show part", "dump object" and "delete object" to accept a local ID as well as a UUID. 
This means that the sub-commands are now id rather than uuid, e.g. show object id
 2012-10-24 04:10:22 +01:00
Justin Clark-Casey (justincc)
f76dceb90b Get "save oar" and "save iar" to tell you in a more friendly manner if the filename to save already exists, rather than exception throwing. 
Also changes ConsoleUtil.CheckFileExists to CheckFileDoesNotExist() since this is more meaningful in the context, even though it does result in double negatives.
 2012-10-24 03:08:58 +01:00
Justin Clark-Casey (justincc)
73db057fa1 Add "dump object uuid" console command. This allows any object in the scene to be serialized and dumped to XML for debug purposes. 2012-10-24 02:05:28 +01:00
Justin Clark-Casey (justincc)
938fa96b9f minor: Move co-ordinate related help to object commands to common ConsoleUtil.CoordHelp 2012-10-24 01:33:21 +01:00
Melanie
484eca323b Merge branch 'master' into careminster 2012-10-23 17:25:40 +01:00
Melanie
13cef0b16a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/LandData.cs
 2012-10-23 17:23:36 +01:00
Justin Clark-Casey (justincc)
319ebaca06 Make it possible to turn the base UDP object packet pools on and off whilst running via the "debug lludp pool <on|off>" console command. For debug purposes. 
This does not currently apply to the higher LLUDP packetpool.
 2012-10-23 02:44:15 +01:00
Justin Clark-Casey (justincc)
4578ff74fe Add object count stats for new IncomingPacket and UDPPacketBuffer pools if they are enabled. Add count stats for existing LLUDP pool. 
This introduces a pull stat type in addition to the push stat type.
A pull stat takes a method on construction which knows how to update the stat on request.
In this way, special interfaces for pull stat collection are not necessary.
 2012-10-23 01:52:10 +01:00