ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-03 09:29:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,022 Commits 5 Branches 82 Tags
00a23eea0ec5d3607cf9cd021a3a182da258686e
Commit Graph

2945 Commits

Author SHA1 Message Date
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
9fd9836841 Make User Agent Service and Login Service separable. 2010-09-04 16:39:03 -07:00
Diva Canto
8fc68c6d98 Added XFF header processing. Untested, for lack of proxy. 2010-09-03 17:18:53 -07:00
Justin Clark-Casey (justincc)
b8da15c104 In RemoveAdminPlugin, use a .ini file template in XmlRpcCreateRegionMethod rather than an older XML one 
This is a patch from http://opensimulator.org/mantis/view.php?id=4973.  Thanks randomhuman
 2010-09-03 22:38:40 +01:00
Melanie
4e0d6e8e41 Merge branch 'master' into careminster-presence-refactor 2010-09-03 03:37:18 +01:00
Melanie Thielker
7128e1a4ba Implement UploadBakedTexture cap 2010-09-02 16:20:44 +01:00
Melanie Thielker
0f40ec5c65 Implement UploadBakedTexture cap 2010-09-02 16:10:44 +02:00
Justin Clark-Casey (justincc)
7b03cb09e4 minor: Add some method doc to BaseHttpServer.HandleRequest() 2010-08-30 22:33:45 +01:00
Melanie
79bfa275da Merge branch 'master' into careminster-presence-refactor 2010-08-30 02:30:28 +01:00
Jonathan Freedman
0a83fde85c Implements parcel media setting persistence and packet / CAPS handling 
properly for the new media settings.

Signed-off-by: Melanie <melanie@t-data.com>
 2010-08-30 02:07:55 +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
483fc88b07 Merge branch 'master' into careminster-presence-refactor 2010-08-24 17:37:11 +01:00
Melanie
de85aabcbe Plumb the region type through to the ProductName field in estate messages 2010-08-24 12:41:21 +01:00
Melanie
1bfec00a88 Merge branch 'master' into careminster-presence-refactor 2010-08-23 23:55:15 +01:00
Melanie
f445659dd3 Finally putting estate_settings.xml to rest. There will be no more attempts 
to read or write this file.
 2010-08-21 17:38:47 +01:00
Melanie
f8ff98577e Merge branch 'master' into careminster-presence-refactor 2010-08-21 00:32:26 +01:00
Justin Clark-Casey (justincc)
5155915de1 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-08-20 19:36:04 +01:00
Marck
7aad5af498 Some code cleanup for console command "create region". 
Make region name an optional command parameter.
Avoid question for region name if it has already been specified.
Extend help text.
 2010-08-20 19:35:52 +01:00
Diva Canto
f347d25675 Unit test breakage fix. 2010-08-20 11:09:02 -07:00
Diva Canto
a39ea07158 Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on myipaddress.com. Also removed client IP verification upon UDP connection that had been left there -- we can't do that in general. 2010-08-19 19:54:40 -07:00
Diva Canto
1955b79759 Partial rewrite of client IP verification. Not completely finished yet, and untested. Committing to move to my other computer. 2010-08-19 18:55:30 -07:00
Diva Canto
2b172bef72 Revert "One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943." 
Reverting mostly because of the texture asset files that got committed and cause grief with the 0.7-post-fixes branch. But also because I'm going to go at those mantises in another way.

This reverts commit e47608fc62.
 2010-08-19 09:14:20 -07:00
Diva Canto
e47608fc62 One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943. 
(Files .xml and .txt also want to be committed)
 2010-08-18 16:22:50 -07:00
Melanie
e74809ff4c Merge branch 'master' into careminster-presence-refactor 2010-08-18 00:59:20 +01:00
Diva Canto
a8b80ef800 Added SendTeleportProgress to IClientAPI. Ya know what that means... 8 files affected. 2010-08-16 11:39:46 -07:00
Diva Canto
77de28965a Work on TeleportStart: renamed method from TeleportLocationStart to TeleportStart, and now sending this upon all teleports, not just some, and in the right place (EntityTransferModule). 2010-08-16 11:33:59 -07:00
John Hurliman
d806741e9d * Cleaned up the magic UUID definitions in AvatarWearable.cs 2010-08-13 17:39:45 -07:00
meta7
fb14390fb0 Note to self: don't break the build 2010-08-10 09:17:30 -07:00
meta7
1ead2ed5ee Add a stack trace to the error output on the recursive read lock warning on my RWlocks. Whilst recursive locks are safe, coupled with other issues we're experiencing with the TaskInventoryDictionary it implies that somewhere the lock is not being freed possibly due to a merge error somewhere, and thus it needs to be looked into. 2010-08-10 09:07:17 -07:00
Melanie
8fd3f6cf7f Merge branch 'master' into careminster-presence-refactor 2010-08-07 05:41:41 +01:00
Melanie
a04efe4a4d Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-08-07 05:39:20 +01:00
Melanie Thielker
00fd2e0446 Correct display of landmark about info. Also correct region maturity rating 
in LM info. Maturity is NOT the parcel's setting, that is only for the
image and text. Parcel maturity is governed by region maturity.
 2010-08-07 05:33:49 +01:00
Melanie Thielker
c554de7501 Correct display of landmark about info. Also correct region maturity rating 
in LM info. Maturity is NOT the parcel's setting, that is only for the
image and text. Parcel maturity is governed by region maturity.
 2010-08-07 05:45:52 +02:00
BlueWall (James Hughes)
85d7d0583e Fix XStats formatting: 
Recent libomv update broke the json serialization for
	XStats. This uses String.Format to convert all data to
	strings with fixed decimal (2 places ), or integer formats
	as appropriate.
 2010-08-06 23:27:57 +01:00
Tom
f9f776e407 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-08-06 11:44:57 -07:00
Tom
330343505c Implement CreateNewOutfitAttachments. This addresses mantis #199. 2010-08-06 11:39:10 -07: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)
1270727c96 Merge branch 'moap' 2010-08-06 18:29:30 +01:00
Justin Clark-Casey (justincc)
a133acbd5f Merge branch 'iar-merge' 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
	OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
 2010-08-04 20:56:52 +01:00
Melanie
757929012e Merge branch 'master' into careminster-presence-refactor 2010-08-04 01:11:47 +01:00
Melanie
71cd4d6e84 Revert "remove long unused OpenSim/Framework/Configuration/* projects" 
This reverts commit cdd3f17b2b.
 2010-08-04 01:10:01 +01:00
Mike Rieker
6e3c79f31e don't mask current time reads (since we don't mask the corresponding subtract) 
if you mask the reads you have to mask the subtract as well.
simplest is just don't mask any of it.
 2010-08-03 20:09:00 +00:00
Tom
f04d51378f Drop the RestClient timeout from 15 minutes to 30 seconds. This does not address the problem, but it will allow the regions to recover in the event that the remote server goes away. 2010-08-03 11:06:41 -07:00
Justin Clark-Casey (justincc)
99c0f4c9c7 Simplify serialized version string. Change element capitalization for consistency 
THIS CHANGE ALTERS THE SERIALIZATION FORMAT, HOPEFULLY FOR THE LAST TIME.  If you're testing, please start with a new database.
This commit also improves locking for manipulation of media entries.
 2010-08-03 17:09:20 +01:00