OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
13,720 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

561 Commits (680e801bf229d54dc57dbca24e841f7f2e8f43d4)

Author SHA1 Message Date
Melanie 4c5788c4c0 Add search URL to Login Service 2010-08-07 22:24:17 +01: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
Diva Canto 0090534793 Added Check4096 config var under [GridService], at the request of many. Changed the iteration that Marck had on the Hyperlinker. 
ATTENTION! CONFIGURATION CHANGE AFFECTING Robust.HG.ini.example and StandaloneCommon.ini.example.
 2010-08-06 17:43:09 -07:00
Marck 7e47ab746e Allow creation of link regions if there is an existing region within a 4096 range. 
Also add GetHyperlinks() to the grid service.
 2010-08-06 17:02:03 -07:00
Melanie 26387252f5 Merge branch 'master' into careminster-presence-refactor 2010-08-06 18:08:40 +01:00
Melanie Thielker f809797d62 Allow the trash folder itself to be passed to PurgeFolder 2010-08-06 15:04:25 +01:00
Melanie Thielker 42613ec536 Allow the trash folder itself to be passed to PurgeFolder 2010-08-06 15:18:48 +02:00
sacha 5da272d042 reverese my last commit 2010-08-06 14:45:54 +00:00
sacha a390541e1c Allowing the expected purge trash folder... 
Please validate !!!
 2010-08-06 14:38:11 +00:00
Diva Canto a1d7911feb Better debug messages 2010-08-04 11:19:23 -07:00
Diva Canto 9ee712459b Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2010-08-03 18:20:08 -07:00
Diva Canto 53fb799778 Further bug fixing, still related to the issue earlier. 2010-08-03 18:19:40 -07:00
Diva Canto 3c5983d8bd Another bug fixed. Same issue. 2010-08-03 17:29:17 -07:00
Diva Canto dd0ebbfb1f this is so bad, brain is beyond fried. must stop. 2010-08-03 17:05:48 -07:00
Diva Canto dd688a5994 sigh. fried brain. 2010-08-03 16:59:34 -07:00
Diva Canto 87046652b1 One more buglet related to the issue at hand. 2010-08-03 16:33:56 -07:00
Melanie e12993ed22 Merge branch 'master' into careminster-presence-refactor 2010-08-04 00:33:02 +01:00
Melanie Thielker 16bdb53683 Allow specifying default region flags. Correct a typo. 2010-08-04 00:31:25 +01:00
Diva Canto ee068dd243 One more thing related to the previous commit. Must avoid all in-process remote calls. 2010-08-03 16:27:11 -07:00
Diva Canto 239478f3a9 Bug fix (HG): mantis #4891. This doesn't actually fix the underlying bug, but it clears up the circular dependency issue between Gatekeeper and UserAgents that had made me resort to in-process remote calls, which, in turn, were hitting bugs down there somewhere in mono. 
NOTE: CONFIGURATION CHANGE IN ROBUST.HG.INI.EXAMPLE !!!###!!!
 2010-08-03 16:02:52 -07:00
Melanie Thielker d9ae837063 Allow specifying default region flags. Correct a typo. 2010-08-04 00:45:15 +02:00
Melanie 5f94b98cb2 Merge branch 'master' into careminster-presence-refactor 2010-08-01 18:00:04 +01:00
Diva Canto c4ecbd1fb1 White space from previous commit. 2010-07-31 16:40:58 -07:00
Marck f91ec19224 Implemented console command "show hyperlinks". 2010-07-31 16:38:23 -07:00
Diva Canto 8c7fd12d5d Bug fix: make m_HypergridLinker static. 2010-07-30 18:07:14 -07:00
Melanie 3302e8ddc4 Merge branch 'master' into careminster-presence-refactor 2010-07-31 00:57:50 +01: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
John Hurliman b83910f12a * Added debug logging to SimianGrid inventory service response parsing 2010-07-29 16:42:00 -07:00
Melanie 7a9e246ccd Merge branch 'master' into careminster-presence-refactor 2010-07-29 16:20:59 +01:00
Melanie aa7cadca52 Add some options 2010-07-24 23:36:07 +01:00
Melanie 4dbff62ef5 Fix some inventory issues 2010-07-24 23:15:06 +01:00
Melanie a70c7756b3 Add sending of the avatar interests and configuration of the profiles 
module as an OpenSim profile module to Simian grid services.
Patch by Dimentox, thank you.
Applied with changes.
 2010-07-22 03:01:50 +01:00
Melanie 0b74662ce2 Merge branch 'master' into careminster-presence-refactor 2010-07-14 19:53:15 +01:00
Justin Clark-Casey (justincc) 71433075a9 Fix obvious bug in XInventoryService.GetFolderItems() which was preventing the iar module from being able to save single item iars 2010-07-14 17:12:12 +01:00
Melanie 5f400a50be Merge branch 'master' into careminster-presence-refactor 2010-07-08 17:32:57 +01:00
Diva Canto 7525f3a556 Don't include hyperlinks as neighbors, even if grid operators have done the mistake of placing them as neighbors. This will not prevent further mess ups coming from that unsupported action. 2010-07-05 04:19:53 -07:00
Tom Grimshaw 14ab22dcd4 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-07-04 06:51:01 -07:00
Tom Grimshaw 3368e3853a Check cached asset to make sure it contains data, and if not, re-request 2010-07-04 06:45:04 -07:00
Melanie 8a45191aa9 Merge branch 'master' into careminster-presence-refactor 2010-07-04 11:02:21 +01:00
Tom Grimshaw 2b49cb9227 Make sure the AssetServiceConnector times out within 30 seconds. If it doesn't, the client will get bored and give an upload error, instead of granting success and entering the asset into our retry queue. 2010-07-03 06:09:20 -07:00
Diva Canto 028303c3e1 Fixes mantis #4835 2010-07-03 02:44:28 -07:00
Melanie e328c23355 Add MapTileURL to robust to supply the url needed by snowglobe 2010-07-02 04:03:35 +01:00
Tom Grimshaw 071d601dcb Cache all assets on upload so that the client can still retrieve the asset if it enters a retry queue 2010-07-01 09:46:57 -07:00
Tom Grimshaw b38a22506b Fix build break 2010-07-01 08:57:13 -07:00
Tom Grimshaw 38384cc79c Report asset upload success if it has previously failed 2010-07-01 08:52:30 -07:00
Tom Grimshaw 4851706d35 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-07-01 08:49:53 -07:00
Tom Grimshaw 1cb7695fb0 Catch newid == null which is what happens if the asset service is offline (seems a connection failure does not throw an exception) 2010-07-01 08:48:02 -07:00