ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-17 04:05:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,264 Commits 5 Branches 93 Tags
da170cde4684ea0f8ed90ea4ed0b30172ad9981d
Commit Graph

2190 Commits

Author SHA1 Message Date
diva
da170cde46 Cleaning up a few HG things. HG Posts may now work in grids, but if the home grid is a standalone, this still doesn't work -- something wrong with RegionAssetService's DB connection. 2009-05-22 04:23:59 +00:00
Melanie Thielker
e5f3337c3f Implement .ini file includes. Anything that begins with "Include-" will be 
treated as another ini source to load.
For example:
Include-Asset = AssetSetup.ini
will load AssetSetup.ini after all other ini files are done.
This works recursively, too
 2009-05-21 23:06:10 +00:00
Melanie Thielker
787d58ae7f Put some meat on the bones of the REST console. NO user functionality yet 2009-05-20 20:28:57 +00:00
Melanie Thielker
3ae9bb6d83 Move the color console logic from the appender into the local console, since 
that is the only one that can use it. Change appender output to always go
through the console output functions.
 2009-05-20 14:40:50 +00:00
Melanie Thielker
4065ebff15 Remove the pre-log4net, discrete output methods from the consoles 2009-05-20 13:50:33 +00:00
Jeff Ames
e0bc5c5db2 Add copyright headers, formatting cleanup. 2009-05-20 01:32:06 +00:00
Melanie Thielker
23d902be42 Remove the old asset cache and local services and the configurations for them 2009-05-18 23:18:04 +00:00
Jeff Ames
5cfd84c924 Update svn properties. 2009-05-17 10:26:00 +00:00
Homer Horwitz
99cf8e3f5a Send the owner name, not the client name on SendDialog. 
This modifies IClientAPI.SendDialog slightly.
Fixes Mantis #3661.
 2009-05-16 16:01:25 +00:00
diva
99167c68b1 Bug fix on POST asset so that the new asset service connector can talk to the old asset server. 2009-05-15 21:11:37 +00:00
Justin Clarke Casey
c11e047410 * Resolve bug where save oar would never complete if any assets were missing 2009-05-15 20:20:55 +00:00
diva
5e4fc6e91e Heart surgery on asset service code bits. Affects OpenSim.ini configuration -- please see the example. Affects region servers only. 
This may break a lot of things, but it needs to go in. It was tested in standalone and the UCI grid, but it needs a lot more testing.
Known problems: 
* HG asset transfers are borked for now
* missing texture is missing
* 3 unit tests commented out for now
 2009-05-15 05:00:25 +00:00
Justin Clarke Casey
6277156044 * When saving an oar, save assets when immediately received rather than storing them all up in memory 
* Hopefully this will remove out of memory problems when saving large oars on machines without much memory
* It may also speed up saving of large oars
 2009-05-14 20:37:54 +00:00
Justin Clarke Casey
303aa4b65e * refactor: move bottom part of 'xml2' serializaton to separate class 2009-05-14 18:08:54 +00:00
Justin Clarke Casey
d10b5e29bc * refactor: break some of xml2 serialization out of sog 2009-05-14 16:33:04 +00:00
lbsa71
95d87244b0 * Moved BaseRequestHandlerTestHelper to OpenSim.Tests.Common.Setup for great justice. 2009-05-14 08:21:14 +00:00
Melanie Thielker
d843b897b2 Move the connector for the new asset server to a connectors project. Inherit 
the region module version from this. This enables inter-server connections
to reuse connetor code from region modules.
 2009-05-14 06:18:18 +00:00
Arthur Valadares
09df50915d * Bug fix: Variable m_regionSettings can be null, using RegionSettings instead, that starts a new RegionSettings object if private variable is null. 
Fixes Mantis #3634
 2009-05-13 22:16:14 +00:00
lbsa71
40e95cab02 * Added some more tests to the GetAssetStreamHandlers 2009-05-13 17:11:53 +00:00
Dr Scofield
b95b7222f9 Disabling WebFetchInventoryDescendents CAPs for the time being as it 
seems to screw up standalone mode.
 2009-05-13 16:34:57 +00:00
Charles Krinke
a5feb0682a Thank you kindly, BlueWall sir, for a patch that: 
Adding a jsonp wrapper to the user supplied status report 
uri if the key "callback" exists. It will work with many 
javascript toolkits to provide an ajax callback to allow 
the browser to update stats reports without the 
intervention of an intermediate server.
 2009-05-13 01:27:23 +00:00
Melanie Thielker
1b7d0a6c93 Paving the way for syncing group permissions across a grid 2009-05-12 14:59:11 +00:00
Charles Krinke
c1d680b6c3 Thank you kindly, Patnad, for a patch that: 
This is to handle the changes in the v1.23 viewer 
of LL regarding the adult rating. With this patch 
a region can be changed to the adult rating from 
LL viewer v1.23 and above.
 2009-05-12 03:30:37 +00:00
Adam Frisby
6dcafec22d * Implements IP and DNS based ban facilities to OpenSim. 
* User interface is ... primitive at best right now.
* Loads bans from bans.txt and region ban DB on startup, bans.txt is in the format of one per line. The following explains how they are read;

DNS bans are in the form "somewhere.com" will block ANY matching domain (including "betasomewhere.com", "beta.somewhere.com", "somewhere.com.beta") - make sure to be reasonably specific in DNS bans.

IP address bans match on first characters, so, "127.0.0.1" will ban only that address, "127.0.1" will ban "127.0.10.0" but "127.0.1." will ban only the "127.0.1.*" network
 2009-05-11 19:23:51 +00:00
Jeff Ames
5164403676 Update svn properties. 2009-05-11 15:14:15 +00:00
Dr Scofield
85bbcf196f adding code to check for old-style responses ("True") 2009-05-11 09:58:36 +00:00
Adam Frisby
54ab7d7ceb * Rather than crash the region simulator, declare the teleport a failure if the "success" mapping doesn't exist. (also; I hate LLSD.) 2009-05-10 21:35:07 +00:00
Adam Frisby
dd8c01d7a7 * Attempting to fix NullRef exception in inventory. 2009-05-10 21:00:07 +00:00
Adam Frisby
2d4166fecf * Debugging some inventory related NullRefException's. 2009-05-10 20:50:38 +00:00
Melanie Thielker
a983f2a3ac Create SynchronousRestObjectRequester and make SynchronousRestObjectPoster 
use that. Mark SynchronousRestObjectPoster.BeginPostObject as obsolete.
 2009-05-10 16:31:10 +00:00
Melanie Thielker
dc4f31db1a Create an async form of the RestObjectPoster. Rename the file (but not the 
class!) to SynchronousRestObjectRequester. Add CacheBuckets parameter to
cache
 2009-05-10 16:20:25 +00:00
Melanie Thielker
1a910b6e1d Connect up the new asset cache and introduce an asynchronous call path 
for asset retrieval (full asset only) to ease migration to the new system
 2009-05-10 14:03:06 +00:00
Melanie Thielker
d8e1842d25 Add some asset cache plumbing. Change the generic cache from UUID to string 
keys to allow caching the new crop of URI identified objects.
 2009-05-10 12:27:05 +00:00
Melanie Thielker
13b2ff83df Small asset cache addition. Comment a debug output left in CAPS 2009-05-10 00:30:51 +00:00
Homer Horwitz
1d234ca83f Fixed handling of inventory a bit 
- AssetType isn't InventoryType. Those enums contain different numbers. Use AssetType for the asset type, InventoryType for the inventory type.
- The ToString method (or ToLower) of AssetType/InventoryType doesn't necessarily return the correct LLSD string.
- Replaced several magic numbers by their corresponding enum.
- Fixed the invType for gestures and animations in the library.
This should fix Mantis #3610 and the non-terminating inventory loading
 2009-05-09 21:11:12 +00:00
Melanie Thielker
b3d29aaeb3 Make remote assets work through the new server system 2009-05-09 04:03:32 +00:00
Melanie Thielker
c8d44971c4 Implement an ingenious solution to pacekt pool performance suggested by 
dlslake.
 2009-05-08 19:03:01 +00:00
Sean Dague
c1a54c02d3 fix up the comments a little 
From: Sean Dague <sdague@gmail.com>
 2009-05-08 18:09:48 +00:00
Sean Dague
b333690969 added WebFetchInventoryDescendents CAP 
From: Robert Smart <smartrob@uk.ibm.com>
 2009-05-08 18:09:41 +00:00
lbsa71
54b5346f16 * Extracted common superclass for GetAssetStreamHandler and CachedGetAssetStreamHandler 
* Added some more tests
 2009-05-08 15:44:35 +00:00
Sean Dague
6b88a205d6 another possible cause of some of the inventory wierdness is the 1/2 implemented 
OSP resolver, and the caching of the uuid seperate from the string that is a UUID.
Change this behavior back to something that ensures the data for the 2 is the same.
Put the 2 unit tests that depend on the new behavior into ignore state.
 2009-05-08 15:40:39 +00:00
lbsa71
8ac73be917 * Introduced new HttpServer.Tests project 
* Split the GetAssetStreamHandler testing into separate tests for BaseRequestHandler
* Ignored some gens
 2009-05-08 06:11:44 +00:00
Sean Dague
f532767c6a fix svn properties 2009-05-08 00:47:32 +00:00
Justin Clarke Casey
aaad2fc8ff * minor: use system ascii encoding rather than newing up our own object 2009-05-07 19:27:38 +00:00
Sean Dague
ce0a84cbc0 instrument most of the tests with a new InMethod function that may help us figure 
out where that pesky deadlock is during test runs.
 2009-05-07 19:07:08 +00:00
Justin Clarke Casey
48c2e7796f * minor: Quieten down temporary profile resolver to only log when it's actually dealing with a temporary profile 2009-05-07 14:23:26 +00:00
lbsa71
f3db3d6a00 * Added some more GetAssetStreamHandlerTests 
* In the process, caught a potential bug where the handler would allow paths not starting with the registered prefix
 2009-05-07 06:31:16 +00:00
lbsa71
1afdf2ee1f * Added some GetAssetStreamHandlerTests 
* Minor tweaks to attain testability
 2009-05-06 17:02:51 +00:00
Justin Clarke Casey
78425e392b * Change automatic properties back to manual get/set 
* Automatic properties are only supported after .Net 2.0, causing these to fail when building via nant on Windows (and probably visual c# 2005 too)
* Hopefully these can be used once building support in Visual C# 2005 is dropped.
 2009-05-05 17:09:46 +00:00
Justin Clarke Casey
f8e0653e73 * If an item creator id contains an iar loaded name, create a temporary profile and hashed UUID to represent the user 2009-05-05 16:45:21 +00:00