ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-05 02:15:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,212 Commits 5 Branches 96 Tags
3b50066ceb620ec00c50e3ea52be398e9914afdc
Commit Graph

137 Commits

Author SHA1 Message Date
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
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
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
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
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
Justin Clark-Casey (justincc)
c09451a034 Report http server onRequest() exception properly. 2010-06-25 19:11:22 +01:00
Diva Canto
31d040dc1e Better error message. 2010-04-26 17:40:00 -07: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