UbitUmarov
b2fa20001f
*test* slow http retries pool rate to original 1s
2012-07-04 06:14:47 +01:00
UbitUmarov
d3f1fc79e5
*TO CHECK/REVIEW/REVERT/TEST whatever* pollService new requests get enqueued to unified requests queue directly. Retries get into that every 100ms. 3 working threads as before plus another that only does retries timming.
2012-07-01 01:33:20 +01:00
Melanie
05cf51cbbd
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
2012-06-29 22:11:49 +01:00
Melanie
7cc5b3d7d3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-06-26 17:35:55 +01:00
Melanie
9a8de52940
Add an event to the poll service manager thread to allow starting it
...
when needed rather than once per second. That is just too slow!
2012-06-26 10:49:37 +02:00
Justin Clark-Casey (justincc)
dca04c7b61
Avoid a race condition where an incoming request to a script external URL can trigger an exception is the URL was being removed at the same time.
...
This involves three steps
1) Return gracefully in UrlModule.HttpRequestHandler() instead of throwing an exception when the url cannot be found in its index
2) Return true instead of false in HasEvents() if no matching request is found in the map. This call will only happen in the first place for raced requests.
3) Return a 404 in GetEvents() if the request is not in the index, rather than a blank 200 OK.
Many thanks to Tom Haines in http://opensimulator.org/mantis/view.php?id=6051 for doing some of the work on this.
2012-06-22 23:16:18 +01:00
Justin Clark-Casey (justincc)
9f3feeff8d
If starting scripts on initial sim start, provide INFO level log feedback each time 50 scripts have been started.
...
This is to provide an indication of what's happening now that the default isn't to report every single script start.
Changes XEngine logging level in OpenSim.exe.config from WARN to INFO.
2012-06-22 02:10:27 +01:00
Melanie
eab211f94d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-06-21 01:10:13 +01:00
Justin Clark-Casey (justincc)
4cfaa01c0a
Remove STARTUP COMPLETE message from the startuplogo.txt file and into main logging
2012-06-20 01:06:55 +01:00
Justin Clark-Casey (justincc)
6b3f9fcde0
Comment out the neighbour and land in connectors from info logging that they are starting up
2012-06-20 00:42:54 +01:00
Justin Clark-Casey (justincc)
ed513fc7be
Fix bug introduced in commit c6e3752
(13 Jun 2012) where poll responses would always return OK even if some other status code had been set
2012-06-16 03:43:45 +01:00
Melanie
32cc9c6094
Merge branch 'master' into careminster
2012-06-15 15:59:49 +01:00
Justin Clark-Casey (justincc)
c935f03467
Put all debug console commands into a single Debug section rather than scattering them over other categories
2012-06-15 03:32:43 +01:00
Melanie
30d872caad
Merge branch 'master' into careminster
2012-06-15 02:53:34 +01:00
Melanie
ca4e6d9b5b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2012-06-15 02:52:56 +01:00
Justin Clark-Casey (justincc)
94517c8d5c
Make the "debug http" command available for robust as well as the simulator. This allows one to see incoming requests as they happen.
...
This required making everything use the common MainServer class for registering and retrieving http servers, rather than duplicate structures.
2012-06-15 02:51:52 +01:00
Justin Clark-Casey (justincc)
257b1b517d
Add main instance to internal MainServer.m_Servers list to simplify internal logic.
...
This does require the server to be added before it is set as the main Instance
2012-06-15 02:03:50 +01:00
Justin Clark-Casey (justincc)
478acfff34
When setting debug http level, do this for all known http servers, not just the main instance.
2012-06-15 01:24:36 +01:00
Justin Clark-Casey (justincc)
6993a26ba5
Get rid of some unnecessary null checks in RegionApplicationBase.StartupSpecific() - a constructor can never return null.
...
Also adds some method doc to MainServer
2012-06-15 00:40:12 +01:00
Justin Clark-Casey (justincc)
9825861f4a
Shuffle "debug http" levels so that 1 and 2 now cause different levels of warn to be logged if we receive invalid xml for xmlrpc.
2012-06-14 23:46:09 +01:00
Justin Clark-Casey (justincc)
f4b02f8e39
Fix a regression in BaseHttpServer.HandleXmlRpcRequests() from recent c6e3752
...
Accidentally make responseString null by default instead of String.Empty.
It needs to be something in case the XmlRpcRequest deserialize throws an exception due to bad xml (a failure which we silently swallow!)
2012-06-14 04:29:15 +01:00
Melanie
12621201ba
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
2012-06-13 02:15:12 +01:00
Justin Clark-Casey (justincc)
c6e375291a
Don't include time to transmit response back to requester when assessing slow handling of requests.
...
This is to avoid logging a 'slow' request when the source of delay is the viewer in processing a response.
This is not something we can do much about on the server end - it's server-side delay that we're interested in.
To ensure consistency, this commit also had to refactor and simplify inbound non-poll network request handling, though there should be no functional change.
IOSHttpResponse no longer exposes the Send() method, only classes in OpenSim.Framework.Servers.HttpServer should be doing this.
Only the GetTextureHandler was sending its own response. Now it leaves this to BaseHttpServer, like all other core handlers.
2012-06-13 00:03:44 +01:00
Melanie
e8cd9fbbb7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-06-07 23:33:40 +01:00
BlueWall
a1e857932a
Make change to fix Windows builds
2012-06-07 10:17:37 -04:00
Justin Clark-Casey (justincc)
98b46d48fe
Allow the thread watchdog to accept an alarm method that is invoked if the timeout is breached.
...
This alarm can then invoke this to log extra information.
This is used in LLUDPServer to show which client was being processed when incoming and outgoing udp watchdog alarms are triggered.
2012-06-07 02:44:13 +01:00
Melanie
884c0e7bb1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-05-27 19:24:30 +01:00
SignpostMarv
99cebec4ab
adding status codes from rfc 6585
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-05-24 12:09:15 -04:00
SignpostMarv
87f9aa9d08
porting IDE tooltip-friendly documentation tweaks from Aurora-Sim
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-05-24 12:09:15 -04:00
Melanie
a90822f4b8
Merge branch 'master' into careminster
2012-05-10 00:42:10 +01:00
Justin Clark-Casey (justincc)
6987aef38d
Improve logging on the prim inventory script asset request path for future use.
...
This adds name and description of the request handler to http request logging when DebugLevel >= 1
2012-05-09 23:12:30 +01:00
Melanie
05634907e9
Merge branch 'master' into careminster
2012-05-08 00:07:18 +01:00
Oren Hurvitz
15844da3af
Log the full exception when errors occur in BaseHttpServer
2012-05-07 19:56:00 +01:00
Melanie
31ab8b2fe0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-05-05 10:32:04 +01:00
Justin Clark-Casey (justincc)
fb99ee6774
minor: Tweak BaseHttpServer message to make it clear that this relates to slow handling of inbound requests.
2012-05-04 01:16:56 +01:00
Justin Clark-Casey (justincc)
231a3bf147
Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.
...
This is most useful for capabilities where the url is not self-describing.
2012-05-03 01:45:49 +01:00
Justin Clark-Casey (justincc)
737e177163
Revert "Log the full exception when errors occur in BaseHttpServer"
...
This reverts commit e31e7c68c8
.
Applied for patch assessment and accidentally committed too early.
2012-04-27 23:46:46 +01:00
Oren Hurvitz
e31e7c68c8
Log the full exception when errors occur in BaseHttpServer
2012-04-27 21:52:04 +01:00
Melanie
464fb2533f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
2012-04-20 16:48:43 +01:00
Justin Clark-Casey (justincc)
f3dda2d85d
Add more exception detail to Exception and IOException throws in BaseHttpServer.HandleRequest()
2012-04-20 03:12:25 +01:00
Melanie
b39de2425c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-04-07 04:52:14 +01:00
Diva Canto
cdbe34716f
Thank you, BaseHttpServer, for telling me where things go wrong.
2012-04-06 11:21:27 -07:00
Melanie
f3132c45d9
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Tests/Common/Mock/TestClient.cs
2012-03-31 02:18:02 +01:00
Justin Clark-Casey (justincc)
e5343bccdf
Add Extended flavour option to opensim version information.
...
This flavour is for changes in addition to the 0.7.3-post-fixes branch that are too large to be considered fixes but should be reasonably stable.
This flavour will almost certainly never see a formal release.
2012-03-30 02:11:32 +01:00
Melanie
c7e302864a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-18 20:44:56 +00:00
Justin Clark-Casey (justincc)
59b6f6a6e0
minor: reuse threadpool count we just fetched instead of fetching it again
2012-03-16 03:56:56 +00:00
Justin Clark-Casey (justincc)
bece2023e7
Add total scripts count to "show threads"
...
However, this returns 0 on Mono (at least on 2.6.7)! So not showing if it is zero.
2012-03-16 03:52:13 +00:00
Justin Clark-Casey (justincc)
6e8f80f1ab
Improve threadpool reporting to "show threads" console command (also gets printed out periodically)
2012-03-16 03:26:47 +00:00
Melanie
b0fc96c17d
Merge branch 'master' into careminster
2012-03-08 19:10:22 +00:00
Justin Clark-Casey (justincc)
749c3fef8a
Change "help" to display categories/module list then "help <category/module>" to display commands in a category.
...
This is to deal with the hundred lines of command splurge when one previously typed "help"
Modelled somewhat on the mysql console
One can still type help <command> to get per command help at any point.
Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet).
Does not affect command parsing or any other aspects of the console apart from the help system.
Backwards compatible with existing modules.
2012-03-08 01:51:37 +00:00
Melanie
1f32730798
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-03-03 09:58:57 +00:00
Justin Clark-Casey (justincc)
aabbbb32ff
Flick master up to 0.7.4
2012-02-29 23:45:14 +00:00
Melanie
37068d17c5
Merge branch 'master' into careminster
2012-02-24 09:56:06 +00:00
Justin Clark-Casey (justincc)
9e6ffe7798
Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually returns and for consistency.
2012-02-24 05:15:47 +00:00
Justin Clark-Casey (justincc)
f67f37074f
Stop spurious scene loop startup timeout alarms for scenes with many prims.
...
On the first frame, all startup scene objects are added to the physics scene.
This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame.
This commit also slightly changes the behaviour of timeout reporting.
Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check.
Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
2012-02-24 05:02:33 +00:00
Melanie
985526b662
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
2012-02-18 22:21:10 +00:00
Justin Clark-Casey (justincc)
b817c337dc
On Windows automatically load the correct native ODE library depending on whether the process is 32-bit or 64-bit
...
In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory.
However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated.
Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected.
This will currently not work with sqlite - I will add that too if this works.
2012-02-18 00:33:52 +00:00
Melanie
727ddffb71
Merge branch 'master' into careminster
2012-01-31 21:53:32 +00:00
Justin Clark-Casey (justincc)
1505c22995
Use Environment.TickCount & Int32.MaxValue; instead of Util.EnvironmentTickCount(); when producing the threads report to reduce wraparound.
...
This matches the tickcount masking in the thread watchdog.
For some reason, Util.EnvironmentTickCount() masks ticks by 0x3fffffff instead of 0xffffffff
2012-01-31 21:09:26 +00:00
Melanie
50aa89dae6
Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-12-08 03:24:25 +00:00
Justin Clark-Casey (justincc)
e6272b8d56
Stop also adding an ordinary http handler when we set up a poll http handler.
...
It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
2011-12-07 12:28:42 +00:00
Justin Clark-Casey (justincc)
4567555c49
Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.
...
This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation.
This is also required to write regression tests that involve the HTTP layer.
If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
2011-12-05 20:44:20 +00:00
Melanie
bc17e2e9cf
Merge branch 'master' into bigmerge
2011-12-05 20:32:35 +00:00
Melanie
b60ff651a3
Merge branch 'master' into bigmerge
2011-12-01 12:16:59 +00:00
Justin Clark-Casey (justincc)
fa63054c4f
On "show caps", stop excluding the seed cap but do exclude it elsewhere
2011-11-29 20:37:03 +00:00
Justin Clark-Casey (justincc)
679a5f6c0b
With "debug http 1", show the path with the query string instead of just the path.
...
Also simplifies debug levels to just 0 and 1
2011-11-29 17:26:45 +00:00
Justin Clark-Casey (justincc)
b6b0bc7b32
Add "debug http" command for currently simple extra debug logging of non-event queue inbound http requests to a simulator
2011-11-29 16:15:52 +00:00
Melanie
31736b1aac
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2011-11-17 19:04:27 +00:00
Justin Clark-Casey (justincc)
aea547cd11
fix build break on UserManagementModule.
...
This also adds time since started to "show threads". Unfortunately these two changes got mixed in.
2011-11-15 23:24:51 +00:00
Justin Clark-Casey (justincc)
29eb3b2eb5
improve formatting of "show threads"
2011-11-15 22:51:12 +00:00
Justin Clark-Casey (justincc)
ccae787d03
send a watchdog heartbeat for a poll worker thread when it's actually run
2011-11-15 22:20:44 +00:00
Justin Clark-Casey (justincc)
7db38a351c
Add number of milliseconds since last update to "show threads"
2011-11-15 21:49:13 +00:00
Melanie
a1426739a2
Merge branch 'master' into bigmerge
2011-11-10 17:35:35 +00:00
Justin Clark-Casey (justincc)
7e488cd635
Remove unused avariable in PollServiceRequestManager
2011-11-07 23:24:13 +00:00
Melanie
fd22159d0c
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Framework/Watchdog.cs
2011-10-26 01:27:24 +01:00
Justin Clark-Casey (justincc)
c275c22928
Restart the event queue worker threads that I accidentally disabled earlier today in 8a0a78c
.
...
Also adds these to the watchdogs with very large timeouts (should really be infinite)
2011-10-25 23:26:21 +01:00
Justin Clark-Casey (justincc)
a4d4f54848
minor: add "threads show" as synonym for "show threads" for consistency
2011-10-25 20:59:27 +01:00
Justin Clark-Casey (justincc)
968cae6c17
Add "threads abort <thread-id>" simulator console command that allows us to abort a watchdog managed thread.
...
This is for diagnostic purposes.
2011-10-25 20:49:46 +01:00
Justin Clark-Casey (justincc)
8a0a78cbcc
Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.
...
This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes.
Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers
Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer
MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
2011-10-25 20:24:21 +01:00
Melanie
27aca49a1f
Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmerge
2011-10-25 03:26:51 +01:00
Melanie
c8dfef1583
Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmerge
2011-10-25 03:26:44 +01:00
Justin Clark-Casey (justincc)
e14cb45b9b
Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer()
...
Remove() presumably does this check anyway since it just returns false if the key is not in the collection.
2011-10-24 23:26:41 +01:00
Justin Clark-Casey (justincc)
9ec672c70b
Fix bugs in EventQueueGetModule.ClientClosed() and BaseHttpServer.RemovePollServerHTTPHandler() that stopped existing code in ClientClosed() from actually tearing down the poll handler
...
Actually doing the tear down appear to have no ill effects with region crossing and teleport.
2011-10-24 23:16:03 +01:00
Melanie
2f6cc77154
Adjust CM version tag
2011-10-12 07:08:23 +01:00
Melanie
336f6f7ec4
Merge commit 'f8c06c61149b1ab3e3002247280be250b558a79e' into bigmerge
2011-10-12 07:07:37 +01:00
Melanie
d1e681f682
Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2011-10-11 23:14:23 +01:00
Justin Clark-Casey (justincc)
f8c06c6114
flip master version up to 0.7.3
2011-10-07 23:41:55 +01:00
Justin Clark-Casey (justincc)
e742cffe15
Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to allow attachments to be temporarily turned off.
...
This is for debugging purposes. Defaults to Attachments Enabled
2011-09-30 01:19:22 +01:00
Tom
66dec3b874
Resolve merge commits, stage 1
2011-09-04 07:06:36 -07:00
Justin Clark-Casey (justincc)
d74686fd51
read m_rpcHandlersKeepAlive under appropriate lock
2011-08-22 02:25:58 +01:00
Justin Clark-Casey (justincc)
c587b0a3a3
oops, fix build break from last commit
2011-08-22 02:10:45 +01:00
Justin Clark-Casey (justincc)
9469c62098
improve locking of m_agentHandlers in BaseHttpServer
2011-08-22 02:07:51 +01:00
Justin Clark-Casey (justincc)
f9a367e2f6
improve locking of m_HTTPHandlers in BaseHttpServer
2011-08-22 01:59:40 +01:00
Justin Clark-Casey (justincc)
5a11cffd23
improve locking of m_streamHandlers in BaseHttpServer
2011-08-22 01:58:50 +01:00
Justin Clark-Casey (justincc)
20a4367827
remove necessity to catch a KeyNotFoundException in BaseHttpServer.RemoveLLSDHandler()
2011-08-22 01:58:19 +01:00
Justin Clark-Casey (justincc)
8254116dc6
improve locking of m_llsdHandlers in BaseHttpServer
2011-08-22 01:52:08 +01:00
Justin Clark-Casey (justincc)
2f1ac1d144
minor: remove mono compiler warning
2011-08-22 01:45:46 +01:00
Justin Clark-Casey (justincc)
94a8ab80c8
improve locking of m_rpcHandlers in BaseHttpServer
2011-08-22 01:43:34 +01:00
root
47cf9c8fe0
Merge branch 'master' into careminster-presence-refactor
2011-07-05 04:01:59 +01:00
Justin Clark-Casey (justincc)
fba961c63f
Make default serverside_object_permissions = true since this better matches user expectations.
...
It also matches the default setting in the OpenSim.ini.example file
2011-07-01 23:06:46 +01:00
Justin Clark-Casey (justincc)
e765759f50
If OpenSim has been built from a git tree, then include version information automatically by dereferencing .git/HEAD
...
A blank bin/.version file will stop this being displayed.
2011-07-01 22:48:00 +01:00
Justin Clark-Casey (justincc)
759e855566
refactor: rename gitCommitFileName to manualVersionFileName since bin/.version doesn't necessary have to be a git hash
2011-07-01 21:47:30 +01:00
Melanie
9b1d3f0c38
Merge branch 'master' into careminster-presence-refactor
2011-06-13 12:38:17 +01:00
Diva Canto
fd57c91b4a
First pass at making the V2 map work. Standalones only for now. There are some issues with the zoom level -- TBD.
2011-06-12 15:37:42 -07:00
Tom
b000d9ba72
Some additional protection, it seems that responsedata needs to be locked, but I can't immediately see where it's being accessed from another thread. For now, this will protect the server
2011-05-26 03:42:01 -07:00
Tom
74dd619575
If a response cannot be obtained (the script has no handler) return a more friendly 500 error instead of crashing out with a null reference and letting the connection hang
2011-05-17 19:12:37 -07:00
Melanie
b451cc1ebb
Merge branch 'master' into careminster-presence-refactor
2011-05-08 20:23:06 +01:00
BlueWall
8ca7938753
Adding ssl support
...
Adding ssl support for "Out of Band" applications such as the remote
admin module or Robust services
2011-05-05 19:56:54 -04:00
Melanie
9bf5e94b70
Merge branch 'master' into careminster-presence-refactor
2011-04-25 23:18:32 +01:00
Diva Canto
507f0e9ffd
Upped VERSION_NUMBER in master to 0.7.2.
2011-04-24 16:21:01 -07:00
Melanie
09b6d717bf
Merge branch 'master' into careminster-presence-refactor
2011-04-21 16:28:29 +01:00
Justin Clark-Casey (justincc)
ccc26f7443
Get Viewer 2 voice working with OpenSim.
...
See http://opensimulator.org/mantis/view.php?id=5336
It turns out that viewer 2 was upset by the lack of a response to viv_watcher.php. This would send it into a continuous login loop.
Viewer 1 was quite happy to ignore the lack of response.
This commit puts in the bare minimum 'OK' message in response to viv_watcher.php. This allows viewer 2 voice to connect and appears to work.
However, at some point we need to fill out the watcher response, whatever that is.
2011-04-20 01:02:40 +01:00
Melanie
474910c9d6
Merge branch 'master' into careminster-presence-refactor
2011-04-17 18:48:53 +01:00
Diva Canto
7592a033df
Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd.
2011-04-12 20:24:28 -07:00
Justin Clark-Casey (justincc)
0ced677510
Revert master version number to 0.7.1 for now to make merging easier.
2011-04-07 23:22:19 +01:00
Justin Clark-Casey (justincc)
a6b1927cff
bump main branch version number to 0.7.2. A separate 0.7.1-post-fixes branch now exists.
2011-04-06 22:05:07 +01:00
Melanie
e4f143fb1c
Merge branch 'master' into careminster-presence-refactor
2011-03-21 07:57:56 +00:00
BlueWall
a3651eb5d0
Thanks Kevin Cozens for a patch that:
...
Fixes several spelling mistakes
2011-03-17 05:48:42 -04:00
Justin Clark-Casey (justincc)
aadd0e8d42
minor: bring comment into line with code reality
2011-03-16 00:14:58 +00:00
Melanie
cee5e3e264
Up the timeout on slow requests to 3000 to stop console spam. Make sure
...
request method and target are reported correctly and drop the txn id
as it's empty 99% of the time.
2011-03-14 14:51:13 +00:00
Melanie
f54ddd88a2
Up the timeout on slow requests to 3000 to stop console spam. Make sure
...
request method and target are reported correctly and drop the txn id
as it's empty 99% of the time.
2011-03-14 12:56:50 +01:00
Melanie
9165a5207d
Merge branch 'master' into careminster-presence-refactor
2011-03-10 07:14:03 +00:00
Justin Clark-Casey (justincc)
9456bb77fb
Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.
...
This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
2011-03-09 23:25:24 +00:00
Melanie
4834b47679
Merge branch 'master' into careminster-presence-refactor
2011-02-19 01:59:49 +00:00
Diva Canto
fc84225038
XFF capitalization strikes again -- this time in the XMLRPC method. mantis #5386
2011-02-16 08:18:49 -08:00
Melanie
076f2ac8db
Merge branch 'master' into careminster-presence-refactor
2011-02-07 23:07:36 +00:00
Melanie
3889e68c54
Merge branch 'master' into careminster-presence-refactor
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
OpenSim/Services/GridService/HypergridLinker.cs
2011-02-07 22:08:53 +00:00
Diva Canto
b20ab1063f
Added a couple of console commands to help diagnose issues:
...
show circuits: shows the lists of agent circuit data
show http-handlers: shows the currently registered http handlers
2011-02-05 17:57:30 -08:00
Justin Clark-Casey (justincc)
ba8826d2b8
Fix "set log level" to once again display current log level if it's not given a parameter
...
This addresses http://opensimulator.org/mantis/view.php?id=5345
2011-02-04 17:11:35 +00:00
Melanie
105deab601
Merge branch 'master' into careminster-presence-refactor
2011-01-23 23:29:25 +00:00
Justin Clark-Casey (justincc)
cb14e1d272
Update the "config get <section> <key>" command to "config get [<section>] [<key>]"
...
The config get command shows a current config value on the console.
Now, if <key> is omitted then all the values for the given section are printed.
If <section> is ommitted then all sections and all keys are printed.
Current config can also be dumped to a file using "config save <path>". This can be handy for resolving or eliminating config issues
2011-01-21 23:59:55 +00:00
Justin Clark-Casey (justincc)
e44ceaaea3
make "show info" and "show version" show the same version text
2011-01-21 23:07:19 +00:00
Justin Clark-Casey (justincc)
43f948d691
add current console log level to "show info"
2011-01-21 23:05:53 +00:00
Justin Clark-Casey (justincc)
b0aebc6f3d
minor: make "show info" help slightly clearer
2011-01-20 21:41:48 +00:00
Justin Clark-Casey (justincc)
a42faca5b9
With mic's permission, adjust long call time info messages to 500ms from 200ms
2011-01-19 01:13:10 +00:00
Melanie
de4eaab584
Merge branch 'master' into careminster-presence-refactor
2011-01-06 19:08:15 +00:00
Mic Bowman
984a9b4085
Added more performance checks to the HTTP server. Each request
...
coming through the WebUtil fns has a request id in the header
that can match the request to the actual work done by the service
2011-01-05 14:32:00 -08:00
Melanie
b1180a53dd
Merge branch 'master' into careminster-presence-refactor
2010-12-21 20:56:37 +00:00
Mic Bowman
a6a136bd90
Shooting in the dark for solutions to the appearance problem
2010-12-20 14:24:52 -08:00
Melanie
8aa63093b1
Merge branch 'master' into careminster-presence-refactor
2010-12-12 01:20:46 +00:00
Justin Clark-Casey (justincc)
3053f5ba7d
minor: remove some compiler warnings
2010-12-10 03:08:31 +00:00
Melanie
45314c6622
Merge branch 'master' into careminster-presence-refactor
2010-12-06 02:54:51 +00:00
sacha
9b9ce8fb27
add more detail to the log in case of FORM Timeout
...
cause nothing relevant are in the services logs
2010-12-04 21:40:18 +00:00
Melanie
ccfbce3176
Remove "OpenSimulator" from startup message
2010-11-09 16:07:43 +01:00
Melanie
09ea73f7cc
Change "OpenSim" to "Careminster" and remove CM suffix.
2010-11-09 15:33:03 +01:00
Jonathan Freedman
4f40374464
Merge git://github.com/opensim/opensim into mantis5110
2010-11-05 19:10:02 -07:00
Melanie
26f12f479f
Merge branch 'master' into careminster-presence-refactor
2010-11-02 22:58:33 +00:00
Marck
4d1f0c5348
Support for CORS with simple requests in BaseHttpServer
2010-11-02 14:11:49 -07:00
Jonathan Freedman
e371d3208c
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
2010-10-30 14:10:13 -04:00
Melanie
818ed2032a
READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.
...
It contains a major interface version bump and will NOT work with earlier grid
services. This is preliminary work that will lead to layers support.
Rest appearance services are commented out completely, they will have to be
adapted by someone who actually uses them. Remote admin is working, but has
no layers support. There is no layers support in the database. Login likely
won't work. You have been warned.
2010-10-30 00:41:36 +01:00
Melanie
7f74dc1b14
Merge branch 'master' into careminster-presence-refactor
2010-10-23 00:21:42 +01:00
Justin Clark-Casey (justincc)
fe8d3d5a2b
Revert "Merge remote branch 'otakup0pe/mantis5110'"
...
This reverts commit 21187f459e
, reversing
changes made to 8f34e46d74
.
2010-10-22 23:52:07 +01:00
Melanie
fc33d569cd
Merge branch 'master' into careminster-presence-refactor
2010-10-21 07:33:01 +01:00
Jonathan Freedman
017b83d0a3
* remove some spurious debug info
...
* The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it.
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-20 22:36:29 -04:00
Jonathan Freedman
55974df14b
* refactor refactor refactor ServerURI 4 lyfe
2010-10-20 22:21:23 -04:00
Jonathan Freedman
94684a2251
* remove some spurious debug info
2010-10-20 02:36:59 -04:00
Jonathan Freedman
4e4fb93fae
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-17 18:45:25 -04:00
Melanie
455a2ba7de
Merge branch 'master' into careminster-presence-refactor
2010-10-16 02:27:51 +01:00
Teravus Ovares (Dan Olivares)
3384f643eb
* Partially complete stuff for Mesh support that Melanie wanted to see before it was done.
...
* Shouldn't break the build.
* Doesn't work yet either.
2010-10-14 02:19:42 -04:00
Jonathan Freedman
32ccc7a9d9
* refactor refactor refactor ServerURI 4 lyfe
2010-10-02 19:17:02 -04:00
Justin Clark-Casey (justincc)
609375bf37
Fix "show threads" to show threads now being managed by OpenSim.Framework.Watchdog
2010-09-14 22:24:11 +01:00
Melanie
1212cb0c74
Merge branch 'master' into careminster-presence-refactor
2010-09-14 22:03:42 +01:00
Melanie
6a1ce17cdb
Merge branch 'master' into careminster-presence-refactor
...
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
2010-09-13 16:17:38 +01:00
Jeff Ames
f1f0bc23f4
Formatting cleanup.
2010-09-12 13:43:49 -04:00
Justin Clark-Casey (justincc)
a7f4e10f42
Remove parenthesis around the release flavour to get the version string back under 27 chars
...
Can't quite remember why this has to be <=27 chars, maybe something to do with the space available for the version string in a typical client
2010-09-10 21:56:04 +01:00
Melanie Thielker
06adbc1324
Revert "Workaround for mono bug #312968"
...
This reverts commit f2e343d530
.
Doesn't compile with our version of Mono. Patched Mono instead.
2010-09-06 17:24:10 +02:00
Melanie Thielker
f2e343d530
Workaround for mono bug #312968
2010-09-06 14:09:46 +02:00
Melanie
09c75b30f3
Fix build break
2010-09-05 16:45:24 +01:00
Melanie
e4c2b44e5c
Merge branch 'master' into careminster-presence-refactor
2010-09-05 15:06:00 +01:00
Melanie Thielker
6a0a878f7c
Remove "Dwell" support from core and replace it with calls to methods
...
on IDwellModule
2010-09-05 14:28:33 +01:00
Melanie Thielker
e593607171
Remove "Dwell" support from core and replace it with calls to methods
...
on IDwellModule
2010-09-05 14:16:42 +02:00
Diva Canto
8fc68c6d98
Added XFF header processing. Untested, for lack of proxy.
2010-09-03 17:18:53 -07:00
Melanie
4e0d6e8e41
Merge branch 'master' into careminster-presence-refactor
2010-09-03 03:37:18 +01:00
Justin Clark-Casey (justincc)
7b03cb09e4
minor: Add some method doc to BaseHttpServer.HandleRequest()
2010-08-30 22:33:45 +01:00
Melanie Thielker
75e2a2b3ce
Prevent an object disposed exception that made forms comms unreliable. After
...
starting an asynchronous write, one should not close the channel it will
be written to synchrnously, that leads to grief.
2010-08-25 23:19:55 +01:00
Melanie Thielker
739eb14741
Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry
...
any useful information. Error messages are useless without location information.
It looks more elegant, but is totally pointless.
2010-08-25 23:18:15 +01:00
Melanie Thielker
1096f43f0d
Prevent an object disposed exception that made forms comms unreliable. After
...
starting an asynchronous write, one should not close the channel it will
be written to synchrnously, that leads to grief.
2010-08-25 23:34:39 +02:00
Melanie Thielker
1bcb2e788f
Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry
...
any useful information. Error messages are useless without location information.
It looks more elegant, but is totally pointless.
2010-08-25 23:04:12 +02:00
Melanie
8fd3f6cf7f
Merge branch 'master' into careminster-presence-refactor
2010-08-07 05:41:41 +01:00
Diva Canto
2369063640
HACK ALERT! There's some underlying bug in the HTTP server that makes requests come up with Accept headers from previous requests. Until that gets fixed, this hack goes in.
2010-08-06 10:59:19 -07:00
Melanie
26387252f5
Merge branch 'master' into careminster-presence-refactor
2010-08-06 18:08:40 +01:00
Justin Clark-Casey (justincc)
a349703279
comment out further debug line in BaseHttpServer
2010-07-27 22:51:57 +01:00
Justin Clark-Casey (justincc)
701f39c8c2
do a whole load of crappy hacking to get cubes to display google.com
...
currently, for smoe reason the page only appears when you click a face.
also, actually navigating anywhere always snaps you back to the google search box, for some unknown reason
you can still change the url and normal navigation will work again
2010-07-26 23:34:17 +01:00
Tom Grimshaw
cea856cfc2
Fix the synchronousrestformsrequester so it will successfully handle a response from a server which does not provide a valid content length header
2010-07-10 19:00:12 -07:00
Tom Grimshaw
cecd660388
Fix an issue where the SynchronousRestObjectRequester will fail if a webserver does not report a content length (-1), but the content is still valid
2010-07-10 18:48:49 -07:00
Melanie
5f400a50be
Merge branch 'master' into careminster-presence-refactor
2010-07-08 17:32:57 +01:00
Melanie
baebefeb05
Handle a specific exception without spewing red ink.
2010-07-08 16:30:36 +01:00
Tom Grimshaw
7665013ad8
Correct positioning of timeout modifier in the SynchronousRestObjectRequester
2010-07-04 19:25:54 -07:00
Tom Grimshaw
3d495b709e
Implement a timeout value in the SynchronousRestObjectRequester. Default is 100 seconds.
2010-07-03 06:08:18 -07:00
Justin Clark-Casey (justincc)
c7e7cb04a3
fix web request exception reporting properly this time
2010-06-25 20:57:38 +01:00
Justin Clark-Casey (justincc)
8629ba80bf
Revert "Report http server onRequest() exception properly."
...
This reverts commit c09451a034
.
2010-06-25 20:51:21 +01:00
Melanie
dc9e9931eb
Merge branch 'master' into careminster-presence-refactor
2010-06-25 20:26:48 +01:00
Justin Clark-Casey (justincc)
c09451a034
Report http server onRequest() exception properly.
2010-06-25 19:11:22 +01:00
Melanie
0031d4a618
Readjust master version and flavor
2010-06-15 01:53:11 +01:00
Melanie
3c3ad08868
Merge branch 'master' into careminster-presence-refactor
...
0.7.1CM Dev
2010-06-12 02:46:11 +01:00
Melanie
85d2e21558
Change trunk versio to 0.7.1 Dev
2010-06-12 02:45:21 +01:00
Melanie
4dd9cf1ce4
Change flavor to 0.7-RC1
2010-06-12 02:44:01 +01:00
Melanie
542e6b8af4
Merge branch 'master' into careminster-presence-refactor
2010-05-28 21:56:42 +01:00
Justin Clark-Casey (justincc)
565db4635f
add a smidgen more log debug information in the form of the operating system version
2010-05-28 18:30:33 +01:00
Melanie
b94cace547
Merge branch 'master' into careminster-presence-refactor
2010-05-16 15:01:56 +01:00
Justin Clark-Casey (justincc)
4b755c6d80
delete now unused MessageServerInfo
2010-05-15 02:17:10 +01:00
Melanie
bbffe16f13
Merge branch 'master' into careminster-presence-refactor
2010-04-27 00:27:05 +01:00
Diva Canto
31d040dc1e
Better error message.
2010-04-26 17:40:00 -07:00
Melanie
9920e219dd
Merge branch 'careminster' into careminster-presence-refactor
2010-04-13 04:36:08 +01:00
Melanie Thielker
a573b5767b
Test commit
2010-04-05 22:31:30 +02:00
Melanie Thielker
5c04d768a6
Bump version number
2010-04-05 22:26:18 +02:00
Melanie
ba31b31ed0
Merge branch 'careminster' into careminster-presence-refactor
2010-04-05 18:22:15 +01:00
Melanie
04a68db195
Merge branch '0.6.9-post-fixes' into careminster
2010-04-05 18:10:36 +01:00
Melanie
5693870fe2
Merge branch 'master' into careminster-presence-refactor
2010-03-30 21:34:27 +01:00
Justin Clark-Casey (justincc)
dd544f811a
switch flavor to RC1
2010-03-26 19:09:09 +00:00
Justin Clark-Casey (justincc)
4565e5dfbc
change trunk version to 0.7.Dev
2010-03-26 18:56:05 +00:00
Justin Clark-Casey (justincc)
bfbf25c542
minor: Print out port that http servers are using
...
do this in callers so that we know who is setting up these things
2010-03-25 21:36:57 +00:00
Justin Clark-Casey (justincc)
6ad85dc259
put out full exception stack if something reaches top of base http server OnRequest() on both mono and .net
...
replace Newtonsoft.Json.XML since the updated copy got accidentally reverted by another commit
2010-03-25 20:33:46 +00:00
Melanie
4c2a51b1b5
Merge branch 'master' into careminster-presence-refactor
2010-03-18 20:09:04 +00:00
Justin Clark-Casey (justincc)
a647f50087
minor logging changes to BaseHttpServer, OSHttpRequest
2010-03-16 22:58:12 +00:00
Melanie
d3f33acc1a
Merge branch 'master' into careminster-presence-refactor
2010-03-15 17:23:35 +00:00
Justin Clark-Casey (justincc)
2313d14acb
minor: add some more documentation for IHttpServer.AddHTTPHandler() to tell the caller that the best match for an incoming request URI is invoked
2010-03-11 23:33:55 +00:00
Justin Clark-Casey (justincc)
a578feefba
very minor spacing adjustment
2010-03-11 20:20:38 +00:00
Melanie
61ce884336
Merge branch 'master' into careminster
2010-01-03 21:43:39 +00:00
Jeff Ames
70d5b1c34c
Formatting cleanup. Add copyright headers.
2010-01-04 06:17:30 +09:00
Melanie
59f683066a
Set version back to core version (base) and suffix CM. Please DO NOT CHANGE THIS
...
in the repo. This is the Caremninster repo and the number follows CORE. Always.
2009-12-25 23:23:49 +00:00
Melanie
b19e564317
Restore version suffix.
2009-12-25 23:20:30 +00:00
Kitto Flora
e7439efc74
Recover out-of-region objects during db load.
2009-12-24 19:19:44 -05:00
Melanie
6eecbc95e4
Merge branch 'master' into careminster
2009-12-23 21:22:19 +00:00
dr scofield (aka dirk husemann)
9c294c5663
- commented out unused method ConvertIHttpClientContextToOSHttp
2009-12-23 18:33:54 +01:00
Melanie
3d3e0ea4f3
Merge branch 'master' into careminster
2009-12-20 16:45:28 +00:00
Kitto Flora
e38e8ae987
Fix mantis #10 & #14
2009-12-19 19:54:44 -05:00
Justin Clark-Casey (justincc)
87e9062862
Make sure that we catch and display any exceptions that get right to the top of our incoming http request handling stack
2009-12-15 16:34:27 +00:00
Justin Clark-Casey (justincc)
57d60a95a2
minor: make logging messages consistent in BaseHttpServer
2009-12-15 16:23:57 +00:00
Melanie
0889b5aef1
Fix version number
2009-12-10 18:20:40 +00:00
Melanie
59ca92b10b
Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
2009-12-10 18:17:29 +00:00
Melanie
43a6fa1d01
Merge branch 'master' into careminster
2009-12-05 19:53:54 +00:00
Teravus Ovares (Dan Olivares)
8e089b6d8d
* Fix line endings in BaseHttpServer.cs
2009-12-05 13:23:05 -05:00
KittoFlora
cc8246206d
Secnond revision of Sit and Stand for unscripted prims; Comment out
...
spammy debug messages in Interregion....
2009-12-05 09:03:02 +01:00
Justin Clark-Casey (justincc)
504bfd87d5
if an xml rpc method throws an exception, log as an error to the console as well as returning the exception to the caller
2009-12-03 18:05:42 +00:00
dahlia
4234c64147
handle a condition where the http headers apparently have multiple remote ports designated
2009-12-02 04:10:53 -08:00
Melanie
d3e7a52933
Merge branch 'master' into careminster
2009-11-28 09:26:00 +00:00
Justin Clark-Casey (justincc)
251fd8c948
Apply patch to reduce git revision text length if running sim directly from a git tree
...
See http://opensimulator.org/mantis/view.php?id=4030
Thanks ChrisDown (and Bruce for reporting)
2009-11-27 18:24:21 +00:00
Melanie
bd3b9f79c2
Update CM version
2009-11-26 17:59:28 +00:00
Justin Clark-Casey (justincc)
52dc9ec003
Bump trunk version number to 0.6.9.
...
This is a place holder name and not necessarily the version number that will be used
2009-11-26 19:00:57 +00:00
Jeff Ames
9f5c2acd12
Formatting cleanup.
2009-11-23 11:26:06 +09:00
Justin Clark-Casey (justincc)
7166f3748a
minor: correct error messages when queryfolder fails
2009-11-18 18:44:47 +00:00
Justin Clark-Casey (justincc)
47e482217e
minor: remove duplicate copyright notice in PollServiceWorkerThread
2009-11-18 16:28:00 +00:00
John Hurliman
b2ed348aa2
Implemented a Watchdog class. Do not manually create Thread objects anymore, use Watchdog.StartThread(). While your thread is running call Watchdog.UpdateThread(). When it is shutting down call Watchdog.RemoveThread(). Most of the threads in OpenSim have been updated
2009-10-22 12:33:23 -07:00
Melanie
1e71e3f910
Remove the "mel_t" from version string
2009-10-22 07:03:40 +01:00
Melanie
9ec55df988
Mark new version
2009-10-22 01:51:27 +01:00
John Hurliman
fdce1be3db
* Removed OpenSim.Data.NHibernate
...
* Replaced calls to ThreadPool.QueueUserWorkItem() with ThreadPool.UnsafeQueueUserWorkItem() since OpenSim does not use Code Access Security sandboxing
2009-10-19 16:52:27 -07:00
Jeff Ames
0d29614ca1
Formatting cleanup.
2009-10-19 08:58:03 +09:00
Diva Canto
29f03d95f3
Bug fix.
2009-10-07 19:20:34 -07:00
Diva Canto
ab3bfca546
Printout one more field in show threads, but this won't buy us much.
2009-10-07 17:29:21 -07:00
John Hurliman
2519f071f2
Fixing a few compile errors in the previous commit
2009-10-06 02:50:59 -07:00
Diva Canto
2753f4d62c
* GridServerPostHandler.cs: Try/catch in Handle
...
* BaseOpenSimServer.cs: Added thread pool numbers in show threads
2009-10-05 16:06:21 -07:00
Diva Canto
75b35ddf4a
More error messages to warn when/if things go wrong.
2009-10-05 09:18:51 -07:00
Diva Canto
f21f3727df
Leaving the MemoryStreams unclosed.
2009-10-04 09:20:01 -07:00
Melanie
6878b26b0d
Merge branch 'diva-textures-osgrid'
2009-10-04 05:49:16 +01:00
Diva Canto
2d9c27a28f
Slightly better message with status code for WebException.
2009-10-03 20:18:21 -07:00
Diva Canto
b6920267f0
Close was being called to early on the Memory stream.
2009-10-03 16:27:55 -07:00
Diva Canto
df7049008a
More streams closed.
2009-10-03 08:57:30 -07:00
Diva Canto
e1112ff879
MOre streams closed. Corrected word in GridCommon.ini.example
2009-10-03 08:46:06 -07:00
Diva Canto
4843edfeb7
Closing more streams.
2009-10-03 08:33:19 -07:00
Diva Canto
006dfd6d9a
Closing another stream.
2009-10-02 20:35:15 -07:00
John Hurliman
387e9f7a7f
* Creates Util.UTF8 and switches some references of Encoding.UTF8 to Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework)
...
* Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization?
2009-10-02 18:31:08 -07:00
Diva Canto
e66321227e
Close streams in MakeRequest.
2009-10-02 16:23:46 -07:00
Melanie
73fa409318
Merge branch 'diva-textures-osgrid'
2009-10-02 23:25:17 +01:00
Melanie
31d8cec0f8
Merge branch 'master' into diva-textures
2009-10-02 08:23:38 +01:00
Jeff Ames
606e831ff5
Formatting cleanup.
2009-10-01 09:38:36 +09:00
Melanie
41e4f3afdb
Remove some tests that no longer apply
2009-09-30 19:14:58 +01:00
Jeff Ames
ee205e7e81
Formatting cleanup.
2009-10-01 01:17:47 +09:00
Jeff Ames
77f5e41631
Remove empty CheckSumServer.cs file.
2009-09-29 21:21:53 +09:00
Melanie
0709149313
Merge branch 'grid-service-redux'
2009-09-28 23:03:47 +01:00
Melanie
7cd03abab5
Bump main version to 0.6.8-Dev
2009-09-28 18:41:21 +01:00
Diva Canto
69da82b39f
Bug fix in SynchronousRestFormsRequester -- Write instead of WriteLine, which was causing an extra \n to be written into the buffer.
2009-09-28 06:44:57 -07:00
Diva Canto
dd3d52ae1f
Added test GridClient, which allowed me to remove a few bugs out of the new code.
2009-09-24 13:33:58 -07:00
Justin Clark-Casey (justincc)
e67341f24c
minor: replace xmlprc 'no method found' magic number with constant from xmlrpc library
2009-09-24 15:02:55 +01:00
Melanie
97c18caa76
Thank you, Intari, for a patch that implements the missing pieces of
...
Http-in and makes the host name for URL generation configurable.
Applied with changes:
llGetSimulatorHostname was not changed, because the change breaks
existing behavior and carries a data exposure risk. That value needs
to be configurable, the proposed fixed change is not acceptable.
2009-09-22 17:04:34 +01:00
Melanie
dafe5bf05f
Completely remove the prior implementation of the request event handling
...
on poll handlers. Introduce a new delegate on the PollServiceEventArgs that
allow access to the request headers and body.
2009-09-22 06:19:02 +01:00
Melanie
c5be401d46
Remove support for executing a handler on poll. It caused other issues
2009-09-22 05:24:22 +01:00
Melanie
06871d51dd
Disable the handler execution for poll services until the ramifications
...
can be studied
2009-09-22 05:13:50 +01:00
Melanie
b6b8a18d37
Add the headers collection to the keysvals for HTT requests
2009-09-21 20:21:01 +01:00
Melanie
61aaf3532a
Add X-PollServiceID pseudo-header to the request handling for polls
2009-09-21 20:10:26 +01:00
Melanie
69b76acce1
Make the poll service handler call the handler method on incoming requests.
2009-09-21 19:46:29 +01:00
Melanie
bc9e4cfd96
Add a RequestID (UUID.Random()) to the PollRequest and pass it to all
...
even hander delegates.
2009-09-21 18:11:40 +01:00
Melanie
04170521f0
Add a UUID param to NoEvents in PollServiceEventArgs to make it more generic
2009-09-21 14:59:31 +01:00
Melanie
2d9d25b367
Add the skeleton of the authentication connector and the forms data requester
2009-09-19 17:33:57 +01:00
Melanie
6461243e7c
Remove the methods for full inventory fetch from the connector. Remove tests
...
for the old, removed asset handlers
2009-09-17 23:55:06 +01:00
Melanie
6779abf7f5
Remove The legacy inventory and asset servers. Bump interface version to 6
2009-09-17 23:39:58 +01:00
Melanie
976cf4284b
Fix up WebFetchInventoryDescendents to really return all data needed,
...
especially the folder version and the subfolders. Fixes inventory search
hang and folders not loading.
2009-08-29 03:26:44 +01:00
Teravus Ovares (Dan Olivares)
6f077d5e5f
* Another attempt at fixing the random spurious test error.
...
* This time it might be the listening socket thread from HttpServer aborting with a non blocking thread abort exception. Hopefully calling Stop() on MainServer.Instance will solve that.
2009-08-26 21:05:46 -04:00
Melanie
8a9d168928
Add try/catch around EQ request processing
...
Fixes Mantis #4061
2009-08-26 14:46:10 +01:00
Diva Canto
cfd9cf7b18
Closed the web request and stream in SynchronousRestSessionObjectPoster -- maybe this is the cause of some timeouts seen in some monos?
2009-08-25 06:17:36 -07:00
Diva Canto
3318652723
Added a more sane InventoryServerMoveItemsHandler. Changed SynchronousRestObjectRequester so that it also understands PUTs.
2009-08-21 11:00:45 -07:00
Kunnis
f1287cc7af
* Switching IAssetData to follow the new naming schema, removing the separate insert and update methods.
2009-08-19 23:45:22 +01:00
Justin Clark-Casey (justincc)
4a992388e3
Apply http://opensimulator.org/mantis/view.php?id=4016
...
Make previously hidden cookies available to code
Thanks jhurliman
2009-08-17 20:02:42 +01:00
Jeff Ames
50f29752f5
Formatting cleanup. Add copyright headers.
2009-08-13 11:48:39 +09:00
dr scofield (aka dirk husemann)
613e6f07fc
change 535cb0efc
so that the default LLSD serialization format is
...
llsd+xml instead of llsd+json --- the latter seems to break existing
bots. this assumes that those bots that want llsd+json will properly
signal that desire, if that is not the case, we need to revisit
this. fixes mantis #3977 .
2009-08-12 14:49:59 +02:00
Chris Down
bb64906a9c
Enable the console show version command and the viewer about command, to show the last git commit hash together with the conmit date and time. The data is retrieved form a file bin/.version This file can be generated automatically using the post commit script by adding the following to the script:
...
git log -n 1 --pretty="format:%h: %ci" > bin/.version
This command can also be run manually to create the bin/.version file.
This command genrates a short form of the commit hash and a date and time of the commit in ISO8601 format.
If a full commit hash is required then change %h to %H
The logic that is used to extract the deprecated svn revision is still included.
It will be removed at a future date
2009-08-11 17:09:35 +01:00
Diva Canto
3f06fb3601
Removing unused files, legacy from old asset "cache".
2009-08-09 17:46:37 -07:00
Teravus Ovares (Dan Olivares)
8b9f8709aa
* FreeContext may be a bit too buggy for my tastes in some environments. * Commenting it for the moment.
2009-08-08 14:14:52 -04:00
Teravus Ovares (Dan Olivares)
535cb0efc1
* Patch from jhurliman to add accept type recognition to determine the llsd content format. *should allow both json and xml serializations of llsd to work properly.
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2009-08-05 16:47:48 -04:00
Jeff Ames
4ce5c894cf
Add copyright header. Formatting cleanup.
2009-08-01 05:11:47 +00:00
Teravus Ovares
23a8895d29
* Fixed another potential httpserver leak.
2009-07-30 18:16:00 +00:00
Melanie Thielker
07579fa402
Add basic support ofr detached request handling to the HTTP server.
...
Groundwork to finish HTTP IN.
2009-07-29 23:13:08 +00:00
Teravus Ovares
83a421a562
* An attempt to fix mantis #3955
...
* It's possible it could re-cause mantis #3953 , but the FreeContext isn't always necessary because Connection: close ---> Disconnect(SocketError.Success) { FreeContext(); }
2009-07-29 21:53:18 +00:00
Teravus Ovares
f727f26bcc
* An attempt to fix mantis #3953
2009-07-29 20:32:54 +00:00
Teravus Ovares
50204f6ee2
* Re trigger panda
2009-07-29 02:41:00 +00:00
Teravus Ovares
032aeb8b5d
* Adds the ability to have a thread efficient long poll service (such as the eventqueue)
...
* If this doesn't melt the Http Server, this will significantly reduce the number of threads in use on regions with many users.
* Adds AddPollServiceHTTPHandler, and RemovePollServiceHTTPHandler to BaseHttpServer
* Generic enough to be used for many long poll services, not only the EventQueue.
2009-07-29 02:15:45 +00:00
Teravus Ovares
687e84048d
* as per my e-mail to opensim-dev archive: https://lists.berlios.de/pipermail/opensim-dev/2009-July/007223.html
...
I'm bumping gridcomms interface version to 5.
MajorInterfaceVersion = 5
2009-07-25 21:16:48 +00:00
Teravus Ovares
c243ae43f2
* Updated C# WebServer to the latest available source download (r19869) and applied a few mods from the old version (now up on opensim-libs (VS 3.5 project).
...
* Made various changes to BaseHttpServer to accommodate the new interfaces.
* This version has been significantly re-architected and may fail in unusual and insidious ways.
* Please pay attention to any errors you get and post a Mantis if you can reproduce an issue with the HTTPServer. I'm including the pdb and having the http server compiled in debug for a few weeks so that when an error occurs, it'll print the pertenant data.
* Once again, this is the full C# WebServer, not the lite branch that is included in LibOMV (we need SSL!)
2009-07-21 06:47:29 +00:00
Justin Clarke Casey
5815162d7e
minor: remove some mono compiler warnings
2009-07-15 20:49:58 +00:00
Jeff Ames
6b3fc3ccb8
Bump version in Framework/Servers/VersionInfo to 0.6.6.
2009-07-15 05:24:06 +00:00
MW
417e3ee1d7
Applied patch from Mantis #3736 , which should stop the userserver crashing when a SL viewer version 1.23 logs in. Thanks StrawberryFride
2009-06-18 20:01:37 +00:00
Jeff Ames
a23d64dec1
Formatting cleanup.
2009-06-10 04:28:56 +00:00
Justin Clarke Casey
87097f2484
* Fix unit tests so that they correctly handle 404 missing asset response
...
* I didn't think there were tests in this area - my bad
2009-06-05 17:03:44 +00:00
Justin Clarke Casey
593942b195
* Fix problem where known missing assets would stop save oar ever completing
...
* Issue was that region server was silently dropping an XmlException caused by trying to deserialize the blank asset service response
* So make asset service return http status NOT FOUND rather than OK in accordance with REST
* and interpret this correctly in the async response so that a null object is sent back
* This means that this fix won't be active until both region simulator and server reach this revision
2009-06-05 16:14:22 +00:00
Justin Clarke Casey
bfea077508
* Add oar saving timeout
...
* If an oar save fails to get responses to all asset requests to the asset service then timeout after 60 seconds
* Timeout executes abort, since missing assets in an OAR seems bad
* This means that oar saves won't permanently hang and instead can be retried if something goes wrong with the asset service
* This is not a solution to mantis 3714. Hopefully a fix will be along shortly since I can now consistently reproduce that problem
2009-06-05 13:48:43 +00:00
lbsa71
8e011ecbbb
* Removed some commented-out code
2009-06-01 20:17:10 +00:00
Jeff Ames
840de6c036
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
Jeff Ames
35b450d41d
Add copyright headers, formatting cleanup, ignore some generated files.
2009-05-31 18:35:00 +00:00
MW
e3e7e73db3
Added option (on my default) to the clone avatar function so that the clothes and attachments that the target avatar is wearing, to begin with, are removed. So the end result isn't a merger of those clothes/attachments and the ones the template avatar is wearing.
...
Added IPAddress ListenIPAddress property to BaseHttpServer so that the listening/binding IP can be set.
2009-05-30 16:13:40 +00:00
lbsa71
0787967f59
* So, giving up on my efforts to de-duplicate the asset handlers. I'll just service commit my current state, then start over and this time concentrating only on the new handlers.
...
* Fixed some erroneous refs in Tests.Common
2009-05-27 18:27:28 +00:00
Jeff Ames
a576cca59e
Update svn properties.
2009-05-27 14:30:33 +00:00
lbsa71
b773a3a02f
* We have strand flavours.
...
* The version string is now reported as "OpenSim 0.6.5 (Dev)"
* This has to be administrated manually.
2009-05-26 16:18:41 +00:00
lbsa71
5d23ecebeb
* Introduced GetVersionString so we can harness the whole thing.
...
* Introduced 'Flavour' to spice things up.
2009-05-26 16:01:06 +00:00
lbsa71
f76615a66d
* slowly getting there...
2009-05-26 15:46:09 +00:00
lbsa71
1cfcace30f
* Changed Version to property for great justice
2009-05-26 15:43:43 +00:00
lbsa71
bac1194391
* Added test to make sure version info is 27 chars long (still don't know exactly why it has to be that, though)
2009-05-26 15:35:55 +00:00
Justin Clarke Casey
582c20b1c4
* reseparate inventory item creator id and creator uuid
...
* unfortunately, while the client requires uuids and we want to be able to have arbitrary string ids, these cannot be kept in sync
* I think the problems last time were due to a serialization change
* So the major inteface version has been bumped to take care of any lingering issues here.
* This means that region servers beyond this revision can only connect to similarly uptodate grid services, and vice versa
2009-05-25 19:54:47 +00:00
lbsa71
ba360ede8b
* Upped version number to 0.6.5
2009-05-25 11:43:56 +00:00
Adam Frisby
e9ea959263
* Pipes IPEndPoint through all Login methods, including LLSD/OSD login paths.
2009-05-23 06:14:02 +00:00
Adam Frisby
31baeef469
* Pipes requestors IP address through all XmlRpcRequest delegates. This is needed to be able to 'NAT-wrap' the login sequence.
...
* If you have something using XmlRpc that isn't in core, change your method signature from:
(XmlRpcRequest request)
to:
(XmlRpcRequest request, IPEndPoint remoteClient)
2009-05-23 06:05:20 +00:00
Dr Scofield
1d02636c27
cleaning out warnings.
...
NOTE: we currently have a gazillion warnings caused stuff flagged as
"obsolete" (OGS1 stuff) --- what's up with that?
2009-05-22 14:57:00 +00:00
Dr Scofield
ac2fe53e89
adding RemoveXmlRpcHandler to IHttpServer
2009-05-22 11:37:14 +00:00
Melanie Thielker
4065ebff15
Remove the pre-log4net, discrete output methods from the consoles
2009-05-20 13:50:33 +00:00
Jeff Ames
e0bc5c5db2
Add copyright headers, formatting cleanup.
2009-05-20 01:32:06 +00:00
diva
99167c68b1
Bug fix on POST asset so that the new asset service connector can talk to the old asset server.
2009-05-15 21:11:37 +00:00
lbsa71
95d87244b0
* Moved BaseRequestHandlerTestHelper to OpenSim.Tests.Common.Setup for great justice.
2009-05-14 08:21:14 +00:00
lbsa71
40e95cab02
* Added some more tests to the GetAssetStreamHandlers
2009-05-13 17:11:53 +00:00
Charles Krinke
a5feb0682a
Thank you kindly, BlueWall sir, for a patch that:
...
Adding a jsonp wrapper to the user supplied status report
uri if the key "callback" exists. It will work with many
javascript toolkits to provide an ajax callback to allow
the browser to update stats reports without the
intervention of an intermediate server.
2009-05-13 01:27:23 +00:00
Jeff Ames
5164403676
Update svn properties.
2009-05-11 15:14:15 +00:00
Melanie Thielker
a983f2a3ac
Create SynchronousRestObjectRequester and make SynchronousRestObjectPoster
...
use that. Mark SynchronousRestObjectPoster.BeginPostObject as obsolete.
2009-05-10 16:31:10 +00:00
Melanie Thielker
dc4f31db1a
Create an async form of the RestObjectPoster. Rename the file (but not the
...
class!) to SynchronousRestObjectRequester. Add CacheBuckets parameter to
cache
2009-05-10 16:20:25 +00:00
Melanie Thielker
b3d29aaeb3
Make remote assets work through the new server system
2009-05-09 04:03:32 +00:00
lbsa71
54b5346f16
* Extracted common superclass for GetAssetStreamHandler and CachedGetAssetStreamHandler
...
* Added some more tests
2009-05-08 15:44:35 +00:00
lbsa71
8ac73be917
* Introduced new HttpServer.Tests project
...
* Split the GetAssetStreamHandler testing into separate tests for BaseRequestHandler
* Ignored some gens
2009-05-08 06:11:44 +00:00
Sean Dague
f532767c6a
fix svn properties
2009-05-08 00:47:32 +00:00
Sean Dague
ce0a84cbc0
instrument most of the tests with a new InMethod function that may help us figure
...
out where that pesky deadlock is during test runs.
2009-05-07 19:07:08 +00:00
lbsa71
f3db3d6a00
* Added some more GetAssetStreamHandlerTests
...
* In the process, caught a potential bug where the handler would allow paths not starting with the registered prefix
2009-05-07 06:31:16 +00:00
lbsa71
1afdf2ee1f
* Added some GetAssetStreamHandlerTests
...
* Minor tweaks to attain testability
2009-05-06 17:02:51 +00:00
Jeff Ames
07d680a010
Remove bin directory from HttpServer.
2009-05-05 09:31:49 +00:00
Melanie Thielker
7f1c393bc3
Remove the csproj files that got into SVN
2009-05-04 21:05:15 +00:00
Melanie Thielker
ec0d2c28fa
Committing the changed tree
2009-05-04 20:19:21 +00:00
Melanie Thielker
acfb5051cd
Intermediate commit. WILL NOT COMPILE!
2009-05-04 20:15:39 +00:00
Melanie Thielker
1b877234da
Refactor. Make ConsoleBase a true base class. Create CommandConsole as a simple
...
console capable of processing commands. Create LocalConsole as a console
that uses cursor control and context help. Precursor to a distributed
console system for the new grid services. No functional change intended :)
2009-05-04 12:15:55 +00:00
Charles Krinke
280d2cbf4a
Thank you kindly, BlueWall, for a patch that:
...
Move json stats to non-published resource name
Remove well-known resource name for json stats,
creating dynamic uris with private keys and add
a user configurable resource name for region owner usage.
2009-05-02 16:28:30 +00:00
Jeff Ames
5ede445bdf
Update svn properties.
2009-05-01 05:16:05 +00:00
diva
81bc38708a
Thanks Tommil for a patch that adds a caching option to GetAssetStreamHandler. It is used in the RegionAssetService.
2009-04-27 15:23:18 +00:00
Dahlia Trimble
4792e6139a
Thanks Bluewall for Mantis #3519 : a patch that adds simulator uptime and version to REST/json statistics reporting
2009-04-25 05:06:01 +00:00
Dr Scofield
458f7eb9b3
cleaning up, fixing warnings
2009-04-22 09:42:44 +00:00
Jeff Ames
6aa5d3904d
Add copyright headers. Formatting cleanup.
2009-04-22 00:48:56 +00:00
Charles Krinke
27c8cc5b1f
Thank you kindly, TLaukkan for a patch that:
...
Added support for loading bare asset binaries (as opposed to
xml encoded asset base) to both sandbox asset service and cable beach.
* Added support for enabling region asset service when mxp is enabled.
* Moved base http server content type defaulting before invocation of
request handle method to allow for variable content type in the response.
2009-04-21 19:42:36 +00:00
Charles Krinke
b4cb45bb79
Fixes Mantis # 3469. Thank you kindly, BlueWall, for a patch that:
...
This patch adds extended status reporting with the url
http://server:port/simstatusx/ [^] . The data is returned
in json format as "text/plain" type.
2009-04-17 21:48:48 +00:00
Justin Clarke Casey
9f6b8ec9b0
minor: Remove some mono compiler warnings. Uncomment code when it's actually being used.
2009-04-15 19:46:37 +00:00
lbsa71
29355de6ee
* Some more experimental work on distributed assets. Nothing hotwired yet.
...
* Introduced preprocess step in FetchAsset (Might revert this later)
* Some minor CCC
* Added actual implementation of GetUserProfile( uri ) and the corresponding handler to OGS1.
* Introduced non-functioning GetUserUri( userProfile) awaiting user server wireup (this might move elsewhere)
2009-04-13 20:04:18 +00:00
Justin Clarke Casey
2176a80bcf
* Terminate OpenSim startup if we cannot listen to the designated HTTP port
...
* This makes the problem much more obvious to the user, and OpenSim isn't that useful without inbound http anyway
2009-04-09 19:46:14 +00:00
lbsa71
958d764172
* Upped trunk version number to 0.6.4 as we just tagged 0.6.4-release
2009-04-01 19:44:46 +00:00
Melanie Thielker
76ca096384
Add a PIDFile in [Startup], which the PID will be written to
2009-04-01 12:13:42 +00:00
Dr Scofield
0bb3d2e6d7
cleanup
2009-03-25 07:36:56 +00:00
Justin Clarke Casey
8f1844665b
* Group OpenSim.Framework.Servers interfaces together
2009-03-19 19:21:17 +00:00
Justin Clarke Casey
bd2180d9af
* refactor: Create IHttpServer interface instead of accessing BaseHttpServer via CommunicationsManager directly
2009-03-19 18:11:44 +00:00
Justin Clarke Casey
b05be5b06b
* Lock http handlers dictionary in other places as well to avoid race conditions
...
* No adverse effects on a quick multi-machine grid test
2009-03-19 17:07:00 +00:00
Justin Clarke Casey
1e6056c24b
* Add necessary locking to BaseHttpServer.RemoveHTTPHandler()
2009-03-19 16:51:21 +00:00
Justin Clarke Casey
eb0c369409
* Add documentation to BaseHttpServer.AddHTTPHandler()
2009-03-19 16:41:23 +00:00
Justin Clarke Casey
acad0328b2
* Make all coded defaults match settings in OpenSim.ini.example
...
* In most cases, the setting in OpenSim.ini.example is taken as the canonical one since this is the file virtually everyone ends up using
* OpenSim will start up with a blank OpenSim.ini, in which case sqlite is the default database (as before)
2009-03-11 18:02:22 +00:00
Justin Clarke Casey
dd28d6ceeb
* minor: reduce some code duplication in BaseHttpServer
2009-03-10 18:22:46 +00:00
Dr Scofield
c6415ef71d
fixing out-of-sync error in BaseHttpServer
2009-03-10 15:51:17 +00:00
Teravus Ovares
5b8c925641
* Adding application/x-oar to the list of content types to which the HTTP Server will return the response as if it was a binary file pending discussion on the [opensim-dev] mailing list to be initiated by dmiles.
2009-03-07 06:14:31 +00:00
lbsa71
fcb737c7f9
* Upping to interface version 3 - let's see how this goes.
2009-02-21 14:12:06 +00:00
Jeff Ames
7a649a758d
Add copyright headers. Minor formatting cleanup.
2009-02-21 03:32:25 +00:00
Jeff Ames
b515645151
Update svn properties.
2009-02-21 03:00:17 +00:00
lbsa71
2e095f5727
* Upped VersionInfo to 0.6.3 and in the process, changed assemblyinfo to 0.6.3.* to better track down dll ref and overwrite problems.
2009-02-20 16:47:31 +00:00
lbsa71
5e39e515f9
* Another stab at removing AssetServer.exe dependencies
2009-02-20 02:26:27 +00:00
lbsa71
b99d9bdeb1
* Reverted the AssetServer fix, apparently something was dependent on IAssetDataPlugin being in OpenSim.Data
2009-02-19 19:32:53 +00:00
lbsa71
1bcc489f5b
* Moved the AssetStreamHandlers to OpenSim.Framework.Servers
...
* And there, all refs to OpenSim.Grid.AssetServer.exe gone.
/me takes a bow.
2009-02-19 19:04:51 +00:00
Justin Clarke Casey
4550093353
* Fix http://opensimulator.org/mantis/view.php?id=3193
...
* Make it possible once again to set a console log level threshold in OpenSim.exe.config
2009-02-19 17:57:40 +00:00
Justin Clarke Casey
6db1f3c6a6
* Lock remaining m_rpcHandlers use since these accesses are not guaranteed to be thread safe
2009-02-12 18:54:48 +00:00
Justin Clarke Casey
d29e0498ff
* Apply http://opensimulator.org/mantis/view.php?id=3138
...
* Adds a GetXmlRPCHandler() to the BaseHttpServer
* Thanks mpallari
2009-02-12 18:01:29 +00:00
lbsa71
801da4346a
* optimized usings.
2009-02-12 09:53:12 +00:00
Melanie Thielker
9bfbfa381a
Add proper handling for shared vs. unshared modules to the command
...
interface. Shared modules will now only get added once, so the command
handler is called once per module, not once per scene. Removal of scenes
has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
Justin Clarke Casey
d1d93fae6c
* Restore show information for the OpenSim region server (version, info, threads, etc.)
2009-02-09 18:11:09 +00:00
Melanie Thielker
54c6a920ba
Replace the console for all OpenSim apps with a new console featuring command
...
line editing, context sensitive help (press ? at any time), command line
history, a new plugin command system and new appender features thet let you
type while the console is scrolling. Seamlessly integrates the ICommander
interfaces.
2009-02-07 12:25:39 +00:00
Justin Clarke Casey
732cd838b1
* Make existing module commanders register as help topics
...
* Typing help will now give a list of these topics at the top (as well as the rest of the current help stuff)
* Typing help <topic> will give information about commands specific to that topic
2009-02-05 21:35:59 +00:00
diva
cf1fd7de4a
Closing the requestStream and setting a 10 sec timeout for getting it.
2009-02-04 13:13:47 +00:00
Charles Krinke
bcc7a8f09c
Fixes Mantis #3032 . The VersionInfo.cs file was not updated from 0.6.1 to 0.6.2 with the last minor release and shows incorrectly on the console. This will resolve itself on the next svn update.
2009-01-22 15:57:47 +00:00
Justin Clarke Casey
1baa921463
* minor: remove some mono compiler warnings
2009-01-13 18:35:20 +00:00
Justin Clarke Casey
363054bb2c
* minor; Very minor non-functional tidy ups
2009-01-13 18:23:37 +00:00
Justin Clarke Casey
66637ad6e7
* minor: Add a couple of code comments about enabling httpserver logging
2009-01-13 16:56:10 +00:00
Teravus Ovares
fcc3325f3b
* Adds the variables passed to the hashtable BaseHttpServer passes in.
...
* Null check on Sessions_report.
2009-01-08 22:01:57 +00:00
Justin Clarke Casey
b077723a20
* minor: remove some mono compiler warnings
2009-01-05 20:58:57 +00:00
diva
19cb2cb395
Undoing the bump up of MajorInterfaceVersion number back to 2. This just doesn't work in practice!
2009-01-03 07:31:48 +00:00
diva
158de95bde
Another interregion comms change that will not work well with previous versions. This commit moves InformRegionOfChildAgent from OGS1 to RESTComms, effectively having the complete child agent life cycle over REST: create=POST, update=PUT, close=DELETE.
...
Additional changes include more functions in the IHyperlink interface, and some refactorings in the HG code for better reuse in RESTComms.
2009-01-03 07:05:33 +00:00
Teravus Ovares
e9cef70f89
* Updates the sim stats module. Cleans out some of the rot.
...
* Adds a prototype web stats module which is disabled by default. It's functional with one report right now, however, the database structure may change, so I don't recommend enabling this to keep actual stats right now. I'll let you know when it's safe.
* Adds Prototype for ajaxy web content
* removed a warning or two.
2009-01-03 03:30:03 +00:00
diva
fe20ff8072
Added http-method to the hashtable that gets passed to GenericHTTPMethods.
2008-12-31 18:26:31 +00:00
Charles Krinke
b1d235a60c
Change VersionInfo.cs from 0.6.0 to 0.6.1 in preparation
...
for the 0.6.1 minor release.
2008-12-20 19:13:02 +00:00
Teravus Ovares
8f07f2e8b0
* A few more fixes to HttpServer.
...
* http://www.codeplex.com/webserver/WorkItem/View.aspx?WorkItemId=3110 fix erronious call to beginread that caused an exception which was caught and ignored (increase performance)
* Pass socket into httpclientcontectImp and call the disconnect + reuse method so the socket can be reused quicker (increase performance)
* Ensured that in every error scenario beginAccept is called (stability)
* Fixed header casing (standards compliance)
* Fixed Connection: close handling (standards compliance)
2008-12-20 15:09:01 +00:00
Teravus Ovares
a66657f155
* Tweak my previously mentioned nasty hack so it's a little less nasty
2008-12-18 13:17:54 +00:00
lbsa71
56f1b03cd0
* Added "show queues" command that shows throttling queues for all clients.
...
*** This only works for LLCLientView at the moment ***
2008-12-18 13:16:41 +00:00
Teravus Ovares
0f25e8298b
* Add a nasty hack to try and give the HttpServer a few extra lives until we dig more into what's causing it to stop listening.
2008-12-18 11:44:53 +00:00
lbsa71
68c53c6da0
* Caught unhandled IOException, and outputted it to log.
2008-12-18 11:39:24 +00:00
Teravus Ovares
f4acaafd3a
* Added more articulate logging of HttpServer so we can diagnose issues.
2008-12-18 02:42:26 +00:00
Teravus Ovares
6358c21208
* Committing an opensim level error message on httpserver. This might help with the eventqueue http server death.
2008-12-18 01:52:49 +00:00
Charles Krinke
6cf0b81864
Mantis#2811. Thank you kindly, Diva for a patch that resolves
...
some of our DNS/dotted decimal issues that plague teleporting.
We are increasing the MajorInterfaceVersion from 1 to 2 in the
gridserver, so sims will need to be updated on various grids.
2008-12-13 16:25:20 +00:00
MW
11169c0e71
Made BaseOpenSimServer.ShutdownSpecific() public. As the OpenSimBase.Shutdown() includes a Environment.Exit(0); which is not always wanted when shutting down, like from a windows service.
2008-12-02 11:40:22 +00:00
MW
67c260fdcc
Added a Catch(InvalidOperationException) to BaseHttpServer.HandleRequest(). Which is thrown due to errors in the XML deserializing. Without this catch is it easy to bring down any of the opensim servers on purpose by just sending corrupt xml to them.
2008-12-01 11:23:27 +00:00
lbsa71
0f5112ffff
* Adding the incoming url as Param[2] in the XmlRpcRequest
2008-11-25 11:45:34 +00:00
Melanie Thielker
f518ca7feb
Reapply r7369 r7367 r7366 r7370 r7381. This brings it back up to the new
...
libOMV.
2008-11-19 06:25:34 +00:00
Melanie Thielker
3234472d62
Reverting the texture sending patch and the new libOMV. This makes this
...
release a direct descendant of the stable 7364, with all the features and
none of the issues.
This omits the following patch chain: r7383 r7382 r7381 r7377 r7375 r7373
r7372 r7370 r7369 r7368 r7367 r7366
2008-11-19 06:15:21 +00:00
Justin Clarke Casey
c25a0ea792
* Update libOMV to r2359. This is necessary for the progressive texture patch
...
* Update libopenjpeg as well for this patch.
* Appears to be okay on a very short sniff test
* Source code will be placed in opensim-libs shortly
2008-11-17 21:00:34 +00:00
Justin Clarke Casey
072624b19d
* minor: add interface version to 'show version' command output
2008-11-17 20:22:22 +00:00
Melanie Thielker
d66f3993de
Add group permissions to agent inventory.
...
Contains a migration. May contain nuts.
Please back up your inventory data store. This revision changes the interface
version!! No older regions can connect to these new UGAIM, and the new regions
can't connect to the old UGAIM. Fixes a long-standing issue of permissions loss
Currently persisted on MySQL only.
2008-11-14 18:54:38 +00:00
Melanie Thielker
724390e413
Change HTTP server backlog/acceptors to 64, per Adam Z
2008-11-12 18:59:38 +00:00
Justin Clarke Casey
97816f8c90
* Implement basic region filtering as described in https://lists.berlios.de/pipermail/opensim-dev/2008-November/003468.html
...
* This is done by sending a 'major interface version' number on sim registration. Developers must increment this every time they make a change that would make the previous
OpenSim revision failure incompatible with the new one (non-fatal incompatibilities are fine).
* This number resides in OpenSim.Framework.Servers.VersionInfo.MajorInterfaceVersion
* This allows the grid service to stop older, incompatible regions from connecting
2008-11-11 17:02:46 +00:00
Adam Frisby
b0a90642de
* Made ClientLoop non-infinite, ClientLoop will now disengage when the client has logged out.
...
* Cleaned up a section of LLClientView
* Removed unused 'using' from HTTPServer
* Please test this patch.
2008-11-08 16:22:36 +00:00
Charles Krinke
69afefa788
Change Version string from 0.5.11 to 0.6.0 for release.
2008-11-08 14:32:56 +00:00
Jeff Ames
bbb8d6fc51
Remove empty OSUUID.cs file. Add copyright headers. Minor formatting cleanup.
2008-11-08 14:28:43 +00:00
Justin Clarke Casey
ee178c76ae
* Apply http://opensimulator.org/mantis/view.php?id=2535
...
* Catch and report deserialization exceptions on rest handlers
* Thanks Diva!
2008-11-03 22:29:19 +00:00
Justin Clarke Casey
8c71954e08
* Use nini to pass config information to the client stack, rather than the ClientStackUserSettings class
...
* This conforms better to other module usage
2008-11-03 18:33:35 +00:00
Homer Horwitz
38e8853e57
Megapatch that fixes/adds: friend offer/deny/accept, friendship termination,
...
on-/offline updates, calling cards for friends.
This adds methods in the DB layer and changes the MessagingServer, so a full
update (incl. UGAIM) is necessary to get it working. Older regions shouldn't
break, nor should older UGAIM break newer regions, but friends/presence will
only work with all concerned parts (UGAIM, source region and destination
region) at this revision (or later).
I added the DB code for MSSQL, too, but couldn't test that.
BEWARE: May contain bugs.
2008-11-01 22:09:48 +00:00
Justin Clarke Casey
f8c2efbe70
* Instead of putting 0.5.11.00000 if there is no revision, just put 0.5.11 instead
...
* This is to make things less confusing to users (and maybe a little easier to do future version filtering for grid connections)
* If there's disagreement about this, then please say so (preferably in the opensim-dev mailing list)
2008-10-29 19:57:30 +00:00
Justin Clarke Casey
7beeaf51f8
* minor: remove mono compiler warnings
2008-10-28 21:47:43 +00:00
Justin Clarke Casey
2a9796e2aa
* Apply http://opensimulator.org/mantis/view.php?id=2482
...
* Stop 'show threads' throwing an exception if a thread is dead
2008-10-28 15:01:43 +00:00
Homer Horwitz
5e6954dfe6
Fixed the cause of a hidden Exception which prevented BaseHttpServer to answer
...
when a non-existing XmlRpc method was called. Now, it will correctly respond
with a faultCode/faultMessage.
2008-10-25 13:45:26 +00:00
Dr Scofield
b91857b8f7
Adding AddXmlRpcHandler(name, method, bool) to selectively disable
...
KeepAlive for certain XmlRpc handlers.
Making use of new AddXmlRpcHandler method in RemoteAdminPlugin to
avoid clients waiting indefinitely for response.
taking note of BaseHttpServer parameter in CommunicationsManager
constructor (was passed it but then just ignored so far).
2008-10-23 10:15:19 +00:00
Homer Horwitz
80689c98b4
- Added BaseHttpServer.Stop
...
- Added "register" command to MessagingServer to re-register with the
UserServer after that crashed/was restarted.
2008-10-22 17:06:23 +00:00
Teravus Ovares
55fa9c7378
* Remove a warning from BaseHttpServer
2008-10-14 02:45:44 +00:00
Teravus Ovares
d19400db44
* Just some OGP maintenance. Standards adherence type stuff.
2008-10-10 12:59:16 +00:00
Justin Clarke Casey
c692c14a2f
* Bump server info number to 0.5.11
2008-10-09 18:40:54 +00:00
Dr Scofield
1e8533772f
adding OSHttpResponse test case (yeah, very primitive still)
2008-10-08 13:45:42 +00:00
Dr Scofield
ad04626737
cleaning up OSHttpResponse: note that read access to extra header
...
fields is GONE (HttpServer does not support that), you can read the
"normal" HTTP headers available via properties, and you can add
headers. also, it is now possible to set a timeout for KeepAlive (for
those clients that pay attention to it).
this also fixes the broken REST inventory/assets/appearance services,
they should be working again.
testcase for OSHttpResponse will follow.
2008-10-06 21:59:43 +00:00
Dr Scofield
348893ccac
oops. forgot testcase
2008-10-06 21:47:06 +00:00
Dr Scofield
a1f3409032
cleaning up OSHttpRequest removing old Http stuff. also adding test
...
case for OSHttpRequest (not very fancy yet, but still).
2008-10-06 19:42:03 +00:00
Teravus Ovares
ca125bcf15
* Committing a few keep-alive changes. Cleaned up some log messages
2008-10-03 20:38:32 +00:00
Teravus Ovares
ae265e2f76
* Fixes a http protocol violation in HttpServer in Linux. StringWriter.Append() vs StringWriter.Append("\r\n"); StringWriter.Append() produces "\n" in *nix*
...
* This doesn't solve anything. Just gets the protocol right.
2008-10-03 19:54:48 +00:00
Justin Clarke Casey
170cb935cd
* refactor: make shutdown a template method in the same manner as startup, for consistency's sake
2008-10-03 16:06:00 +00:00
Justin Clarke Casey
0487c3158b
* minor: restore the standard startup logo text now I understand why things were appearing in the wrong order
2008-10-03 15:44:44 +00:00
Justin Clarke Casey
3ffd77f70b
* oops, fix region startup to be in the correct sequence (though it appeared to work anyway)
2008-10-03 15:41:27 +00:00
Justin Clarke Casey
fbc813e658
* For shits and giggles, print out the time taken for a server to start up (which doesn't include stuff such as script starting time on the region server).
...
* Yes, you could work this out from timestamps in the logs, but that's far too much work
2008-10-03 15:23:35 +00:00
Justin Clarke Casey
70124a3213
* refactor: make startup a template method
2008-10-03 15:11:29 +00:00
Justin Clarke Casey
8c55f3eaa6
* minor: remove warnings (the code cleaners strike again)
2008-10-03 14:18:17 +00:00
Teravus Ovares
8de395d379
* EventQueueGet is now working.
...
* Switched it on by default
* Updated OpenSim.ini.example to reflect this
* Caught a UDP Server issue that occurs when the network pipe is saturated
* Still experimental :D
2008-10-03 09:53:49 +00:00
Homer Horwitz
fb9acb80ef
- Fix invalid cast in OSHttpRequest
...
- Web-map should work again :)
2008-10-02 22:10:49 +00:00