ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-14 17:55:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
31,108 Commits 5 Branches 96 Tags
a45420cf34313addef328ff7987700c5bf319716
Commit Graph

734 Commits

Author SHA1 Message Date
Melanie
69054ad134 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
 2013-10-06 18:32:20 +01:00
teravus
31246ecd04 * Added a unique and interesting WebSocket grid login processor by hijacking the LLSD login code. This sends the data through the normal login channels and spits out a JSON object back that mimics the login response. Feel free to comment on the best way to set this up as a config option. 2013-10-04 20:53:01 -05:00
Justin Clark-Casey (justincc)
42bdf44658 Bump OPenSimulator version and assembly versions up to 0.8.0 Dev 2013-10-04 23:33:47 +01:00
Melanie
2f365ea80b Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2013-09-07 13:54:19 +01:00
Justin Clark-Casey (justincc)
4cbadc3c49 Allow one to specify a DefaultHGRegion flag in [GridService] in order to allow different default regions for HG and direct grid logins. 
This requires a new GridService.GetDefaultHypergridRegions() so ROBUST services require updating but not simulators.
This method still returns regions flagged with just DefaultRegion after any DefaultHGRegions, so if no DefaultHGRegions are specified
then existing configured defaults will still work.
Immediate use is for conference where we need to be able to specify different defaults
However, this is also generally useful to send experienced HG users to one default location and local users whose specified region fails (e.g. no "home" or "last") to another.
 2013-09-02 17:27:45 +01:00
Melanie
bef03fb30b Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
 2013-08-17 03:23:45 +01:00
Justin Clark-Casey (justincc)
b3052c425e Remove some mono compiler warnings from OpenSim/Server/Handlers 2013-08-17 01:08:19 +01:00
Melanie
7830cc9954 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
	OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
	OpenSim/Services/HypergridService/UserAgentService.cs
 2013-07-18 10:08:10 +01:00
Diva Canto
f3b3e21dea Change the auth token to be the user's sessionid. 2013-07-14 07:28:40 -07:00
Diva Canto
b4f1b9acf6 Guard against unauthorized agent deletes. 2013-07-13 21:28:46 -07:00
Diva Canto
931eb892d9 Deleted GET agent all around. Not used. 2013-07-13 17:56:42 -07:00
Justin Clark-Casey (justincc)
c3db595944 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-07-08 22:07:27 +01:00
Justin Clark-Casey (justincc)
e19defde36 Add "show caps stats by user" and "show caps stats by cap" console commands to print various counts of capability invocation by user and by cap 
This currently prints caps requests received and handled, so that overload of received compared to handled or deadlock can be detected.
This involves making BaseStreamHandler and BaseOutputStream record the ints, which means inheritors should subclass ProcessRequest() instead of Handle()
However, existing inheriting classes overriding Handle() will still work, albeit without stats recording.
"show caps" becomes "show caps list" to disambiguate between show caps commands
 2013-07-08 22:03:07 +01:00
Diva Canto
bbb9af363d Print out caller IP when unusual requests are received. 2013-07-07 20:43:42 -07:00
Melanie
5ddcc25ee9 Merge branch 'master' into careminster 2013-07-04 22:32:58 +01:00
Diva Canto
4d24bf75fd Deleted debug messages. Fixed a null ref exception on the POST handler of GridUserServerPostHandler.cs 2013-07-02 16:46:35 -07:00
Melanie
ffcee82b1d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2013-06-30 18:27:30 +01:00
Justin Clark-Casey (justincc)
e26e8b8829 Remove "Asset deletion not supported by database" message from "delete asset" robust/standalone console command since it actually was implemented and performed. 
Improve other associated messages.
 2013-06-28 19:19:38 +01:00
Melanie
f70357eaa3 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Monitoring/BaseStatsCollector.cs
	OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
	OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
 2013-06-23 01:59:57 +01:00
Diva Canto
6c7e33fe47 Change IsLocalRegion from using region handle to using regionID. This was affecting UpdateAgent and CloseAgent in cases where the foreign region is on the same coordinates as *some* local region. 2013-06-22 08:29:06 -07:00
Diva Canto
4778d67005 Finally moved HG agent transfers to use agent fatpacks. 2013-06-21 20:52:46 -07:00
Justin Clark-Casey (justincc)
9501a583cb Make number of inbound http requests handled available as a httpserver.<port>.IncomingHTTPRequestsProcessed stat 2013-06-18 23:07:18 +01:00
Justin Clark-Casey (justincc)
0d2fd0d914 Make general server stats available on the robust console as well as the simulator console 
This means the "show stats" command is now active on the robust console.
 2013-06-17 22:39:00 +01:00
Melanie
9975c5674c Merge branch 'master' into careminster 2013-06-13 02:49:43 +01:00
Justin Clark-Casey (justincc)
824a4b4808 After calls to GetSuitcaseXFolder() in HGSuitcaseInventoryService, consistently check for null return and log warning rather than throw exception. 
This was being done already in some places.
If an exception is thrown it is now an error rather than debug
 2013-06-12 23:47:47 +01:00
Melanie
ea9e1d1a1e Merge commit 'e449950030decf7e65e7d9b334ddaed25c1bd629' into careminster 2013-06-06 03:04:47 +01:00
BlueWall
cd64da8746 Cleanup 2013-06-05 18:41:55 -04:00
Melanie
648e258b8e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
 2013-06-04 21:09:25 +01:00
BlueWall
d7fa9f671e Adding standard OpenSim header to source files 2013-05-31 22:03:27 -04:00
BlueWall
328883700a UserProfiles 
UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
 2013-05-30 17:59:18 -04:00
Melanie
42c82b564e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
 2013-05-16 21:59:14 +01:00
Justin Clark-Casey (justincc)
3bc8cf65a4 Where this is not already happening, trigger asychoronous calls to CloseChildAgent() above the LocalSimulationConnector level. 
This is so that other callers (such as SceneCommunicationService.SendCloseChildAgentConnections() can perform all closes asynchronously without pointlessly firing another thread for local closes).
No functional change apart from elimination of unnecessary chaining of new threads.
 2013-05-16 17:30:30 +01:00
Diva Canto
4194d935ec Fixed mantis #6609 -- LoadPlugin error messages on Robust. 2013-05-13 13:07:39 -07:00
Melanie
b89d18e6f4 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2013-04-30 23:45:38 +01:00
Justin Clark-Casey (justincc)
3ce198165c minor: remove some mono compiler warnings in ServicesServerBase 2013-04-29 22:21:57 +01:00
Melanie
7c729e1519 Merge branch 'master' into careminster 2013-04-29 00:38:20 +01:00
Diva Canto
90a6891a7d Better error reporting 2013-04-27 10:34:23 -07:00
Melanie
b9146a7922 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/BaseOpenSimServer.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-03-15 23:45:32 +00:00
Justin Clark-Casey (justincc)
7fb458b055 minor: log an error rather than info if a connector fails to load. 2013-03-15 22:08:11 +00:00
Justin Clark-Casey (justincc)
3a7d9f740e minor: Make logged message in ServerUtils more consistent. 2013-03-15 22:05:18 +00:00
Justin Clark-Casey (justincc)
12900ea84e Log same environment information to Robust log as is already done for simulator logs, for debug purposes 2013-03-14 23:39:15 +00:00
Melanie
a675f7d4c3 Merge branch 'master' into careminster 2013-03-01 23:54:00 +00:00
Justin Clark-Casey (justincc)
faf96f5c85 minor: Log location in which simulator/robust was started. 
Useful information for system debugging, especially if logging and ini files locations have been changed from defaults.
 2013-02-28 23:59:26 +00:00
Melanie
eb9458fd7e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneManager.cs
 2013-02-28 21:20:07 +00:00
Diva Canto
bb44758179 Switched to using the other Util function with a default value. 2013-02-27 20:59:16 -08:00
Diva Canto
f1010d7b15 Moved the HG default variables out of [Startup] and into their own section [Hypergrid] in *Common.ini.example. Backwards compatible for now. 2013-02-27 20:49:41 -08:00
Melanie
e3ea2c4bee Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
 2013-02-23 20:37:09 +00:00
Diva Canto
0e8289cd00 Added new Util function for reading config vars that's more generic than the one I added yesterday -- this is for helping move config vars out of [Startup] 2013-02-22 15:57:33 -08:00
Melanie
9534d5f929 Merge branch 'master' into careminster 2013-02-22 01:28:54 +00:00
Diva Canto
e515cdddec Simplification of HG configs: HomeURI and GatekeeperURI now are defined as default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency. 2013-02-21 17:26:19 -08:00