6faa7fc7f9
Prevent a buffer overflow in asset receiving
2012-11-17 02:31:56 +01:00
392e84e554
Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuid
...
This was necessary historically but hasn't been for many years.
Can still get CreatorIdAsUuid, which is really just a UUID cached version of the string CreatorId
2012-11-17 01:23:29 +00:00
2aa58c5843
Do not allow invariants to change on calls to XInventoryService.UpdateItem()
...
This is to help track down http://opensimulator.org/mantis/view.php?id=6359 where creator IDs on items and rezzed objects have been reported to sometimes change.
This should never happen - a particular item should never change creators (if an item is given then a new item (with new id) is created).
Invariants are inventory type, asset type, folder (changed only on MoveItems()), CreatorIdentification and Owner.
If caller attempts to change an invariant, warning is logged but other properties are still changed.
If you see this warning, reporting on Mantis 6359 would be very welcome with the exact operation being done at the time.
2012-11-17 01:01:14 +00:00
e25c51330a
Add basic XInventoryServicesTests.TestAddItem() regression test.
2012-11-17 00:12:25 +00:00
55f889cc66
refactor: Move stat classes out of StatManager and into their own files for clarity.
2012-11-16 05:02:06 +00:00
cbc635a9c6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-16 04:48:55 +00:00
cd088757e9
Add a first draft mechanism for the IncomingPacketsProcessedStat to show the delta over time.
...
The chief motivation for this is to be able to tell whether there's any impact on incoming packet processing from enabling extra packet pooling.
2012-11-16 04:36:22 +00:00
e9153e1d1a
Revert "Merge master into teravuswork", it should have been avination, not master.
...
This reverts commit dfac269032619c39e514
2012-11-15 10:05:16 -05:00
dfac269032
Merge master into teravuswork
2012-11-15 09:46:41 -05:00
619c39e514
* Fixes mesh loading issues in last commit.
2012-11-15 09:44:02 -05:00
df62d113ab
The last few AssemblyInfos. Finished!
2012-11-14 21:18:18 -08:00
350cd58e5e
refactor: move common inventory folder version update code to parent class in mysql, mssql and sqlite database plugins
2012-11-15 04:01:30 +00:00
5895c4cc6f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-11-15 03:46:10 +00:00
16dd94b956
Improve inventory folder version updating for mssql database plugin.
...
I am not in a position to test this so the updates have been done blind.
If it needs any fixing will probably require patches.
2012-11-15 03:39:17 +00:00
0c4efdc6a8
Fix build break from 1aa0271 by adding System.Core to prebuild.xml
2012-11-15 03:32:03 +00:00
1aa0271239
Implement folder version updating for the sqlite inventory plugin
2012-11-15 03:29:55 +00:00
daf03bfb56
Handle Map block requests on a separate thread rather than the main packet handling thread.
...
This prevents a slow grid information network call from holding up the main packet handling thread.
There's no obvious race condition reason for not doing this asynchronously.
2012-11-15 03:09:20 +00:00
57273ef7b2
Do HandleMapLayerRequest on its own thread rather than on the main inbound udp packet handling thread.
...
There's no obvious race condition reason for doing this on the main packet handling thread.
2012-11-15 03:07:45 +00:00
df4da51f04
Following on from 4f982596, launch map name requests on an async thread from LLClientView directly.
...
This releases the inbound packet handling thread marginally quicker and is more consistent with the other async packet handling
2012-11-15 03:04:46 +00:00
038528dc80
Make PacketPool class stats pull stats instead of push stats so they can be lifted up into LLUDPServer and be distiguished by scene name
2012-11-15 02:02:59 +00:00
2c36106675
Add IncomingPacketsProcessedCount stat for diagnostics.
...
Also puts some packet processing counts in a container named after the scene so that stats can be collected from more than one scene.
2012-11-15 01:14:18 +00:00
06fa1681ae
Merge branch 'master' into careminster
2012-11-15 00:43:26 +00:00
35fd4474b2
Added AssemblyInfos in the OpenSim.Server namespace dlls.
2012-11-14 11:20:55 -08:00
aeeaa3a0a9
Added AssemblyInfos to every dll in the OpenSim.Region namespace.
2012-11-14 11:09:43 -08:00
27b12cebbb
A few more AssemblyInfos in a few more dlls.
2012-11-14 08:10:15 -08:00
fcaddd901c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-14 07:50:58 -08:00
c88e6fb445
Possibly fixes mantis #6429 (Flotsam cache having a null ref to the asset service)
2012-11-14 07:50:19 -08:00
94da908813
More consistently dispose of SqliteCommand in OpenSim.Data.SQLite where possible.
...
Not doing SQLiteInventoryStore since this is no longer used and should disappear in the future.
2012-11-14 04:45:59 +00:00
2ccb53b42d
If no ISimulationDataStore or IEstateDataStore implementations could be loaded then halt with informative message rather than a later NRE.
...
Halt already occurs if the relevant config sections are not present.
So it also makes sense to halt if the implementations themselves cannot be loaded.
2012-11-14 04:17:39 +00:00
790b595aa0
Added a few more AssemblyInfos. (Plus added the one in OptionalModules, which had been forgotten.)
2012-11-13 19:50:19 -08:00
f3e90cbffc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-13 19:27:02 -08:00
e4cb7af98a
Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't have an AssemblyInfo file.
2012-11-13 19:26:43 -08:00
7861090a17
Replace old Prebuild.exe accidentally added back in f977291 with one built without <copy> nant target generation and on mono 2.4.3
2012-11-14 02:44:10 +00:00
f977291a44
Replace previously updated Prebuild.exe with one built directly with mono 2.4.3
2012-11-14 02:40:37 +00:00
564fe35d4d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-14 02:30:12 +00:00
90c6d2e50c
Stop Prebuild from generating <copy> statements which unnecessarily copy files into bin/Debug or bin/Release
...
nant_0.91~alpha2+dfsg-3_all.deb in Ubuntu 12.04 and earlier actually ignored these due to a bug
However, nant 0.92~rc1+dfsg-2 in Ubuntu 12.10 fixes this bug (possibly https://github.com/nant/nant/pull/39 ).
Which makes nant time-consumingly copy these files when the aren't actually used.
Tested removal of <copy> on both nant 0.91 and nant 0.92
Will be submitting this patch to prebuild project for comment though I suspect there's nobody there to pay attention.
2012-11-14 02:25:07 +00:00
1f9d39c15d
Deleted OptionalModules.addin.xml. Added AssemblyInfo.cs for that dll.
2012-11-13 09:54:52 -08:00
18c5d33f0a
All optional modules' directives moved out of addin.xml
2012-11-13 09:48:56 -08:00
556d70feef
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
2012-11-13 17:37:39 +00:00
89a1388857
Deleted .addin.xml. Added AssemblyInfo.cs
2012-11-13 09:04:32 -08:00
922425a205
Last 27 modules' directives (service connectors out).
2012-11-13 08:49:52 -08:00
457395d9c1
Another 11 modules' directions moved out of .addin.xml
2012-11-13 08:36:44 -08:00
608444c9f7
Another 21 modules' directives moved out of .addin.xml
2012-11-13 08:27:51 -08:00
af01a2320a
Merge branch 'master' into careminster
2012-11-13 10:49:24 +00:00
d73aa8c1a6
Moved the WindModule and its own plugins out of .addin.xml
2012-11-12 21:27:23 -08:00
99ccd4ea44
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-12 21:15:35 -08:00
31177d9259
Another 10 modules' directives moved from .addin.xml
2012-11-12 21:14:58 -08:00
2fd36653b9
minor: Add some explanative method doc to SceneHelpers.SetupSceneModules()
2012-11-13 04:34:03 +00:00
f605a62427
Disable code to get server-side to move given items to a destination folder on TaskInventoryAccepted.
...
This is because the fixes to inventory versioning (so that they better match viewer expections)
now appear to allow the viewer to execute #RLV moves, as happens on the LL grid.
Doing it again server-side now wrongly creates another child #RLV folder underneath the root one.
As per http://opensimulator.org/mantis/view.php?id=6311
2012-11-13 04:15:21 +00:00
29bfd9e46c
Merge branch 'master' into careminster
2012-11-13 02:28:40 +00:00
Melanie