cb3b124df9
Fixes fresh hollowed prim collision shape.
2010-08-04 21:08:00 +00:00
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
7f3f1bfe88
fix mysql/mssql prim serialization problem
2010-08-04 20:23:18 +01:00
a1d7911feb
Better debug messages
2010-08-04 11:19:23 -07:00
4a33210771
Send attachment updates only to the owner if it's a HUD
2010-08-04 18:12:31 +02:00
f72ab53699
Removed a few more obsolete default configs.
2010-08-04 07:50:34 -07:00
a48c493210
Cost Reduction : Removing verbose message....
2010-08-04 08:16:55 +00:00
463fbb4990
If a user has no home position set, tell them so instead of leaving the request dangling
2010-08-04 00:17:02 -07:00
c8f09f7fcb
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-03 22:42:32 -07:00
cd9506e842
Don't know HOW we missed this, llSetPos was broken in child prims (and in the llSetPrimitveParams family), it was using the global coordinate as a start location. This resolves mantis #204
2010-08-03 22:41:02 -07:00
6076eb5558
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-03 19:55:57 -07:00
604ea5fa90
remove more useless defaults
2010-08-04 03:53:51 +01:00
f1c51c8bb4
Scripted sit target fixes
2010-08-03 19:51:32 -07:00
09ab32c21e
Remove StandAlone from default hardcoded config
2010-08-04 03:10:10 +01:00
bda83715e4
Clean up some messiness in IM sending. Having offline IM enabled now no longer
...
suppresses "Inventory Saved" messages.
2010-08-04 02:46:30 +01:00
b38d69287a
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-04 03:24:06 +02:00
0020dbee23
Remove StandAlone from default hardcoded config
2010-08-04 03:23:19 +02:00
9ee712459b
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-08-03 18:20:08 -07:00
53fb799778
Further bug fixing, still related to the issue earlier.
2010-08-03 18:19:40 -07:00
5ff9db7388
Clean up some messiness in IM sending. Having offline IM enabled now no longer
...
suppresses "Inventory Saved" messages.
2010-08-04 02:51:41 +02:00
3c5983d8bd
Another bug fixed. Same issue.
2010-08-03 17:29:17 -07:00
d57bfec702
A god is a god is a god is a god. Right? Right. You're a god from 200, let's
...
show it!
2010-08-04 02:16:46 +02:00
757929012e
Merge branch 'master' into careminster-presence-refactor
2010-08-04 01:11:47 +01:00
71cd4d6e84
Revert "remove long unused OpenSim/Framework/Configuration/* projects"
...
This reverts commit cdd3f17b2b
2010-08-04 01:10:01 +01:00
d987e8ef18
Revert "re-Add the XML configuration loader dll. It's gone AWOL in a cleanup, but"
...
This reverts commit 9c7e35860e
2010-08-04 01:09:51 +01:00
dd0ebbfb1f
this is so bad, brain is beyond fried. must stop.
2010-08-03 17:05:48 -07:00
164719119b
Merge branch 'master' into careminster-presence-refactor
2010-08-04 01:01:08 +01:00
9c7e35860e
re-Add the XML configuration loader dll. It's gone AWOL in a cleanup, but
...
still needed for web-loading region configs and for loading legacy XML
region files
2010-08-04 01:00:06 +01:00
dd688a5994
sigh. fried brain.
2010-08-03 16:59:34 -07:00
87046652b1
One more buglet related to the issue at hand.
2010-08-03 16:33:56 -07:00
e12993ed22
Merge branch 'master' into careminster-presence-refactor
2010-08-04 00:33:02 +01:00
16bdb53683
Allow specifying default region flags. Correct a typo.
2010-08-04 00:31:25 +01:00
ee068dd243
One more thing related to the previous commit. Must avoid all in-process remote calls.
2010-08-03 16:27:11 -07:00
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
d9ae837063
Allow specifying default region flags. Correct a typo.
2010-08-04 00:45:15 +02:00
e3cea888fb
Fix some more issues causing regions with corrupt sculpts to freeze.
2010-08-03 16:07:18 -07:00
ae99c1393d
Fix scripted sit offset in child prims
2010-08-03 15:31:04 -07:00
2221517935
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-03 14:12:05 -07:00
1d1da5069c
Catch a meshing exception caused by corrupt or missing sculpt maps, and mark the prim as "mesh failed" so it doesn't try meshing continuously
2010-08-03 14:11:11 -07:00
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
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
2a0254f2da
Implement MediaUrl persistence for MySQL and MsSQL
...
Not sure how I forgot this. This may resolve problems with media textures not persisting over restart for these databases.
2010-08-03 17:54:40 +01:00
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
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
ac07d853b8
remove duplicated serialization code
2010-08-03 15:58:17 +01:00
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
e3184753a6
Log the UUID of a prim that fails meshing and set the prim to phantom during
...
region startup
2010-08-03 05:25:23 +02:00
d2d1c63b17
Revert "Catch meshing error in Meshmerizer"
...
This reverts commit 8f2986bc6a
2010-08-03 05:25:01 +02:00
ecfea5fa69
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-02 21:56:30 -07:00
8f2986bc6a
Catch meshing error in Meshmerizer
2010-08-02 21:54:47 -07:00
Kitto Flora