ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-20 06:35:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,952 Commits 5 Branches 87 Tags
8fac7c065088d9861ba2ff772fde7f2e9c8d1003
Commit Graph

571 Commits

Author SHA1 Message Date
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