Diva Canto
87d810217e
Guard against inventory get failures.
2012-09-22 14:01:51 -07:00
Diva Canto
772aedc731
Make BaseHttpServer throws say something useful.
2012-09-22 14:01:07 -07:00
ubit
80a81896b6
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-22 22:15:35 +02:00
UbitUmarov
11e05217df
report asset upload errors the right away
2012-09-22 21:14:15 +01:00
Diva Canto
fb6d6e5cca
HG 2.0: User Agent Service now can also control where the local users can go. Domain-name and user-level based. \o/
2012-09-22 11:11:48 -07:00
ubit
93eaaf2ade
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-22 17:47:59 +02:00
UbitUmarov
4bba72b7af
removed AssetUploaderWithCost, fixing AssetUploader. add parsing of some
...
more needed fields in request
2012-09-22 16:47:15 +01:00
ubit
d25a67851d
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-22 13:37:42 +02:00
UbitUmarov
7de67d5680
removed unused data in MeshUploadFlag response
2012-09-22 12:00:14 +01:00
Diva Canto
48f4b32d7f
More HG 2.0: access control at the Gatekeeper. \o/
2012-09-21 21:03:14 -07:00
Diva Canto
ebd99c9e3e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-21 17:59:42 -07:00
Diva Canto
21a6ef5bb6
This fixes HG attachments' missing assets (textures, etc).
...
Also, further improvements on HGUuidGatherer: if the assets are already in this grid don't fetch them again.
2012-09-21 17:58:44 -07:00
Michelle Argus
a6f7328216
Remove deprecated parameters for region_id.
...
Remove deprecated parameters for region_id as anounced in january 2012.
2012-09-22 01:30:38 +01:00
Justin Clark-Casey (justincc)
b36ef60aca
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-22 01:05:33 +01:00
SignpostMarv
8d7b1f8aa0
Documenting non-LSL script-related events
2012-09-22 00:57:29 +01:00
Diva Canto
b0da4b8d13
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-21 16:45:35 -07:00
Diva Canto
cfa022700d
Moved the small HGUuidGatherer class to the file where its parent class is. No need to keep 2 separate files.
2012-09-21 16:45:16 -07:00
Justin Clark-Casey (justincc)
9ab5c5040d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-22 00:26:32 +01:00
Justin Clark-Casey (justincc)
5df3944607
Fix llListFindList() returning no match when there is a match with a script constant component in the source list.
...
Adds regression test for this case.
Based on http://opensimulator.org/mantis/view.php?id=6156
Thanks SignpostMarv.
2012-09-22 00:23:25 +01:00
Diva Canto
fb2ace6fff
Removed redundant asset fetches on HGAssetMapper. The UuidGatherer already downloads the assets, so we don't need to do it again...
2012-09-21 15:55:58 -07:00
Diva Canto
f931c0a868
Minor: may avoid crashes of sims that still don't have this configuration section.
2012-09-21 15:04:41 -07:00
Diva Canto
f4cc19968c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-21 07:45:26 -07:00
Diva Canto
b542622b3a
HG 2.0: added asset import/export policies at the sim too.
2012-09-21 07:44:18 -07:00
Diva Canto
5f97b3e1d9
Minor: change the return value of unsuccessful posts to string.Empty.
2012-09-21 06:41:32 -07:00
UbitUmarov
f9c24c9414
read model upload cost parameters from config [Economy] section
2012-09-21 11:50:14 +01:00
Diva Canto
e379566e6e
Improvement over last commit: refactor the asset permissions code, so that it can be used by both the HG Asset Service and the simulator. Also renamed the config vars to something more intuitive
2012-09-20 19:50:57 -07:00
Justin Clark-Casey (justincc)
80f486c778
minor: Make slow outgoing request log messages consistent with other log messages
2012-09-21 01:59:28 +01:00
Justin Clark-Casey (justincc)
632a42e2b1
Rename UuidGather.m_assetCache to m_assetService. If HGUuidGatherer hasn't been instantiated with an assetServerURL then call down to overriden UuidGatherer.GetAsset() instead of calling m_assetService.GetAsset() itself - these two codepaths are now identical.
2012-09-21 01:57:13 +01:00
Justin Clark-Casey (justincc)
bceef401fa
Simplify UuidGatherer by performing asset fetch synchronously rather than using the async call but waiting for completion anyway!
2012-09-21 01:36:23 +01:00
ubit
a6b2a35ddf
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-21 01:36:16 +02:00
Justin Clark-Casey (justincc)
1b0abf8f0c
Comment out the long unused afaik HTTP agent handlers.
...
As far as I know, this was only used by the IBM Rest modules, much of which has been commented out for a very long time now. Other similar code uses HTTP or stream handlers instead.
So commenting this out to reduce code complexity and the need to make this facility consistent with the others where it may not be used anyway.
If this facility is actually being used then please notify me or uncomment it if you are core.
2012-09-21 00:29:13 +01:00
Justin Clark-Casey (justincc)
e29d563557
Add request number counting to incoming HTTP requests in the same way that this was already being done for outgoing HTTP requests.
...
This allows us to associate debug logging messages with the right request.
It also allows us to put a request number on 'long request' logging even if other debug logging is not enabled, which gives us some idea of whether every request is suffering this problem or only some.
This is a separate internal number not associated with any incoming number in the opensim-request-id header, this will be clarified when logging of this incoming request number is re-enabled.
This commit also adds port number to HTTP IN logging to allow us to distinguish between different request numbers on different ports.
2012-09-21 00:09:17 +01:00
Diva Canto
33aa6d172f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-20 15:51:27 -07:00
Diva Canto
3089b6d824
More HG2.0: Added permission policies in HGAsset Service based on asset types. The policies are given in the config. This is only half of the story. The other half, pertaining to exports/imports made by the sim, will be done next.
2012-09-20 15:49:22 -07:00
Justin Clark-Casey (justincc)
a5b3989e5d
Insert a new log level 4 for HTTP IN and HTTP OUT that will log how long the request took.
...
This is only printed if debug http level >= 4 and the request didn't take more than the time considered 'long', in which case the existing log message is printed.
This displaces the previous log levels 4 and 5 which are now 5 and 6 respectively.
2012-09-20 23:18:19 +01:00
Justin Clark-Casey (justincc)
387a1bb283
Add ability to turn on/off logging of outgoing HTTP requests flowing through WebUtil.
...
This is for debugging purposes.
This is controlled via the "debug http" command which can already log incoming requests.
This now gains a mandatory parameter of in, out or all to control what is logged.
Log messages are also shortened and labelled and HTTP IN or HTTP OUT to be consistent with existing UDP PACKET IN and PACKET OUT messages.
2012-09-20 23:17:44 +01:00
Melanie
5d63c20122
refix prior commit
2012-09-20 15:41:16 +02:00
Melanie
9ff6c85325
Make uploads free for now - we will have to announce this
2012-09-20 15:39:46 +02:00
UbitUmarov
bf987f96d2
Fix model upload rotations and offsets ( i hope )
2012-09-20 14:32:30 +01:00
Justin Clark-Casey (justincc)
b481a78234
Don't fail to create an IRC nick if nick randomization is disabled in the IRC module.
...
Patch from http://opensimulator.org/mantis/view.php?id=6293
Thanks Starflower.
2012-09-20 02:01:01 +01:00
SignpostMarv
d667f9d260
Documentation of teleport-related events
2012-09-20 01:56:18 +01:00
SignpostMarv
696b3f66c4
minor tweaks to existing comments for IDE goodness
2012-09-20 01:50:40 +01:00
SignpostMarv
49e2872f9e
Documentation of agent-related events
2012-09-20 01:50:40 +01:00
SignpostMarv
61f4523e01
Documentation of object-related events
2012-09-20 01:48:50 +01:00
SignpostMarv
a74167bb06
Documentation of OnPluginConsole
2012-09-20 01:47:03 +01:00
Justin Clark-Casey (justincc)
f2a9d26118
Make ResendAppearanceUpdates = true by default in [Appearance] in OpenSimDefaults.ini.
...
This resends appearance uuids to avatars in the scene once a minute.
I have seen this help in the past resolve grey appearance problems where viewers have for unknown reasons sometimes ignored the packet.
The overhead is very small since only the UUIDs are sent - the viewer then requests the texture only if it does not have it cached.
This setting will not help with cloudy avatars which are usually due to the viewer not uploading baked texture data or uploading something that isn't valid JPEG2000
2012-09-20 01:40:05 +01:00
Justin Clark-Casey (justincc)
e50b6b5334
Update libopenjpeg libraries used by libopenmetaverse back up to 1.5, this time using lkalif's linux libraries built against a much earlier libc (2.7)
2012-09-20 01:26:35 +01:00
Melanie
629138d4fa
Change texture price back to 10 C$
2012-09-19 13:01:34 +02:00
ubit
a44939e951
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-19 04:59:48 +02:00
UbitUmarov
5317b1053f
be more tolerant to small prims, skipping them, only failing if they are
...
more than half of total. Add a state control to NewFileAgentInventory
to avoid more than one at a time per client. ( Incomplete and possible not that good)
2012-09-19 03:53:51 +01:00