ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-12 07:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,874 Commits 5 Branches 97 Tags
1bfec00a88a11a13d62a32c0549bbf6e8aa1e69a
Commit Graph

2927 Commits

Author SHA1 Message Date
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
Justin Clark-Casey (justincc)
9d8a67fe13 get rid of PrimitiveBaseShape.MediaRaw staging post 
using an OSD serialization rather than auto forces serialization code to be placed in OpenSim.Framework
this makes the media texture raw data staging post in PrimitiveBaseShape redundant, now we just directly call the code in PrimitiveBaseShape.MediaList itself
 2010-08-03 16:26:27 +01:00
Justin Clark-Casey (justincc)
ac07d853b8 remove duplicated serialization code 2010-08-03 15:58:17 +01:00
Justin Clark-Casey (justincc)
60df76314f serialize media textures to inventory with a largely osd representation rather than .net auto-serialization 
THIS WILL BREAK ANY EXISTING MEDIA TEXTURE SERIALIZATIONS.  If you're testing this, please start with new databases.
This makes media textures serialized in the same way, which is probably better in the long term.
 2010-08-03 15:45:49 +01:00
Melanie
3302e8ddc4 Merge branch 'master' into careminster-presence-refactor 2010-07-31 00:57:50 +01:00
Diva Canto
86bc25b84f Slight improvement on previous commit. 2010-07-30 14:27:53 -07:00
Diva Canto
f3fa10fa15 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2010-07-30 14:04:29 -07:00
Diva Canto
8ab7d80b09 Changed the way HG client verification is done: now transforming local and LAN client IPs into external IPs. This addresses some issues related to running both the user agents service and the viewer in the same machine/LAN, which then presents a problem when the user agent goes to an external network. 2010-07-30 14:04:13 -07:00
Justin Clark-Casey (justincc)
cdd3f17b2b remove long unused OpenSim/Framework/Configuration/* projects 2010-07-30 20:19:46 +01:00
Justin Clark-Casey (justincc)
68b1d6f0af Remove unused ILoginServiceToRegionsConnector 2010-07-30 20:02:00 +01:00
Justin Clark-Casey (justincc)
315b065bce Remove unused LLFileTransfer 2010-07-30 19:58:29 +01:00
Justin Clark-Casey (justincc)
ce358db159 remove long superseded HGNetworkServersInfo 2010-07-30 19:54:27 +01:00
Justin Clark-Casey (justincc)
4596c78073 remove unused FriendRegionInfo 2010-07-30 19:50:47 +01:00
Justin Clark-Casey (justincc)
c7652d287b remove now unused GridConfig, MessageServerConfig, UserConfig 2010-07-30 19:44:39 +01:00
Justin Clark-Casey (justincc)
f393e10ea4 remove unused ACL class 2010-07-30 19:34:55 +01:00
John Hurliman
550c3572a1 * Tweaked WebUtil.PostToService() to help debug an object disposed exception 2010-07-29 14:39:08 -07:00
Melanie
7a9e246ccd Merge branch 'master' into careminster-presence-refactor 2010-07-29 16:20:59 +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)
412fed975f relocate serialization code from SQLiteRegionData to MoapModule using load and save events. 
This is better modularity.  It also allows MoapModule to be replaced with some other media module that may behave completely differently in the future.
Remaining non-modularity:
PrimitiveBaseShape needs explicit Media and MediaRaw fields.  MediaRaw is required in order to shuttle the pre-serialization data back and forth from the database layer.
The database also needs to know about MediaRaw though not about Media.
IMO, it would be extremely nice to remove these hard codings but this is a bridge too far at the present time.
 2010-07-26 23:34:23 +01:00