ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,422 Commits 5 Branches 88 Tags
792e8db45695a6151c4e7d039b792bdfeb5c0f87
Commit Graph

230 Commits

Author SHA1 Message Date
Melanie
f292e19689 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Application/OpenSimBase.cs
 2012-03-11 02:29:43 +00:00
Justin Clark-Casey (justincc)
05e821c444 Fix TestSaveOarNoAssets() by not launch a no-assets request on a separate thread. 
This was previous behaviour anyway.
 2012-03-10 03:11:28 +00:00
Justin Clark-Casey (justincc)
5507752dc5 minor: rearrange some save oar messages so they say what they're about to do rather than what they've just done. 2012-03-10 02:11:30 +00:00
Justin Clark-Casey (justincc)
1693799623 On OAR saving, try fetch assets serially rather than firing all the requests at the asset service at once. 
This may (or may not) improve reliability for http://opensimulator.org/mantis/view.php?id=5898
Quick tests show that save time is the same.
 2012-03-10 02:03:07 +00:00
Melanie
ce5e900721 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
 2012-02-04 11:48:20 +00:00
Snoopy Pfeffer
83ef13a79a Changed save oar and save iar parameter -p|--profile to -h|--home, including corresponding RemoteAdmin parameter 2012-02-03 23:53:18 +01:00
Melanie
abffda269f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
 2012-01-28 04:05:53 +00:00
Justin Clark-Casey (justincc)
154ba0124a Add experimental --publish option to "save oar" so that OARs reloaded to the same grid don't have the publisher as owner. 2012-01-28 02:21:41 +00:00
Melanie
ba3b0c69f1 Merge branch 'master' into careminster 2012-01-21 19:52:33 +00:00
Justin Clark-Casey (justincc)
9356963bd3 Add basic request and send image regression tests for LLImageManager 2012-01-19 19:00:11 +00:00
BlueWall
eea726d74e RegionReady: 
Back out some of the oar monitoring for the time being. Need to find  a better way to get feedback. Will re-visit this soon.
 2012-01-18 20:30:57 -05:00
Melanie
43128c9016 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-01-14 06:09:19 +00:00
BlueWall
57ba9ef5ad Update RegionReadyModule 
Fix triggering of alerts when rezzing first script to an empty region, add login disable when loading oars.
 2012-01-13 11:35:44 -05:00
Diva Canto
8bdd80abfa HG: normalize all externalized user ULRs to be the Home URL, i.e. the location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI. 2012-01-12 09:56:35 -08:00
Melanie
4492bc1bcd Merge branch 'master' into careminster 2012-01-12 17:52:29 +00:00
Mic Bowman
5f7e392c7c Add a check to see if an asset exists before recreating it while 
loading an archive. This does add an extra roundtrip to the asset
server if loading new assets but it protects against overwriting
(and potentially corrupting) existing assets.
 2012-01-10 16:26:01 -08:00
Melanie
e058b0822f Merge commit 'f16d125027aba098e45dc026f9d507a430bc2b10' into bigmerge 2011-10-25 03:17:26 +01:00
Justin Clark-Casey (justincc)
f16d125027 Change wording on asset requests. 
Not all 'notified missing' assets are a problem.  Some are invalid references which happen to be buried in other text.
 2011-10-19 23:56:17 +01:00
Tom
5484c9b585 Bring us up to date. 2011-09-14 19:11:32 -07:00
Oren Hurvitz
7f318277f1 When creating an OAR, optionally exclude objects according to their permissions 2011-09-12 20:09:24 +01:00
Justin Clark-Casey (justincc)
bea2e0f32b Comment out the part of the load oar code that zeroes out prim sit target orientations and positions. 
The warning about these causing problems is very old and may no longer apply.
Hopes to fix http://opensimulator.org/mantis/view.php?id=5680
 2011-09-09 22:50:54 +01:00
Tom
66dec3b874 Resolve merge commits, stage 1 2011-09-04 07:06:36 -07:00
Justin Clark-Casey (justincc)
dad1d6df18 rename TestHelper => TestHelpers for consistency 2011-08-06 00:31:03 +01:00
Justin Clark-Casey (justincc)
bda1a4be45 rename test SceneSetupHelpers -> SceneHelpers for consistency 2011-08-06 00:26:37 +01:00
Melanie
6ae73aea49 Merge branch 'master' into careminster-presence-refactor 2011-06-20 03:11:34 +01:00
Justin Clark-Casey (justincc)
603dbea190 tweak messages. Make verbose inventory item save message give the item name as well as item id and asset id 2011-06-14 00:51:18 +01:00
Melanie
a1c16a4200 Merge branch 'master' into careminster-presence-refactor 2011-06-11 12:08:02 +01:00
Oren Hurvitz
804fe2d9b0 Save the sun's position in OARs 2011-06-10 20:55:58 +01:00
Melanie
326c46ba70 Merge branch 'master' into careminster-presence-refactor 2011-06-09 02:05:04 +01:00
Justin Clark-Casey (justincc)
e9988a3728 Make sure culture is en-US when saving archive related xml. 
This might resolve http://opensimulator.org/mantis/view.php?id=5475
 2011-05-27 21:19:20 +01:00
Melanie
f02fbdbc68 Merge branch 'master' into careminster-presence-refactor 2011-05-27 01:10:02 +01:00
Justin Clark-Casey (justincc)
3270f4353e Add --noassets option for "save iar" 
Like "save oar", this saves an iar without assets
This can be useful for backup when you know the required assets will still be present (e.g. you're backing up the assets db separately).
This also bumps the iar format version to 0.3 and 1.2 respectively.
0.3 is backward compatible with previous opensim versions
1.2 is used if the --profile switch is specified.  It is only compatible with 0.7.1 presently.
 2011-05-26 02:22:52 +01:00
Justin Clark-Casey (justincc)
c7e46e8a51 Bump OAR file format version up to 0.7 for this development cycle. 
This adds a <assets_included>true|false</assets_included> element to the oar control file, though this is not used on reloading at this time.
This addition is backward compatible with previous opensim releases
 2011-05-26 01:37:15 +01:00
Justin Clark-Casey (justincc)
6f4d079fc5 Add a --noassets option to "save oar". 
This switch stops any assets being saved in the oar.
This can be useful if you're using OAR to backup regions and you know you'll always have the original asset database available.
 2011-05-26 01:27:01 +01:00
Melanie
be1996f121 Merge branch 'master' into careminster-presence-refactor 2011-05-22 20:23:25 +01:00
Justin Clark-Casey (justincc)
bb9b317f15 Get rid of OpenSim.Tests.Common.Setup subpackage in favour of just OpenSim.Tests.Common instead 2011-05-21 01:05:20 +01:00
Melanie
37a7b87862 Merge branch 'master' into careminster-presence-refactor 2011-05-14 21:09:52 +01:00
Oren Hurvitz
64d868fb64 When loading an OAR that doesn't have parcels, create a default parcel 2011-05-14 00:41:32 +01:00
Melanie
09b6d717bf Merge branch 'master' into careminster-presence-refactor 2011-04-21 16:28:29 +01:00
Justin Clark-Casey (justincc)
6109605038 bump oar version number to 0.6. 
This commit contains no data changes - the version bump is to establish a version at which the control file must come first in the archive.
 2011-04-18 22:42:36 +01:00
Justin Clark-Casey (justincc)
6600aa2baf Add regression test to check that OARs start with the control file. 2011-04-18 22:35:33 +01:00
Melanie
9165a5207d Merge branch 'master' into careminster-presence-refactor 2011-03-10 07:14:03 +00:00
Justin Clark-Casey (justincc)
9456bb77fb Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately. 
This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
 2011-03-09 23:25:24 +00:00
Melanie
3f200da878 Merge branch 'master' into careminster-presence-refactor 2011-01-28 02:36:20 +00:00
Justin Clark-Casey (justincc)
f9ea5e69c5 Refactor: Break out LoadObjects() and LoadParcels() from a longer method 2011-01-27 21:07:21 +00:00
Melanie
3435816541 Merge branch 'master' into careminster-presence-refactor 2011-01-27 20:54:02 +00:00
Justin Clark-Casey (justincc)
be3685b1a2 When an oar is loaded, do not create a default parcel before loading the parcels from the OAR. 
The region spanning parcel shouldn't exist in this situation.  If it does, when the land data is loaded it is repersisted with a local ID which comes after the ones loaded via the oar, which obliterates the oar loaded one.

Resaving the data we just loaded from the database is somewhat odd in itself (though this makes sense from the way that OAR loading was already using the same event).
 2011-01-27 20:36:50 +00:00
Justin Clark-Casey (justincc)
42c0dbf49a Show local IDs in "land show" output. 
Also properly insert region name in "land clear" command
 2011-01-27 20:11:30 +00:00
Justin Clark-Casey (justincc)
5a26dc2743 Fix OAR parcel loading so that old parcels are replaced by the new instead of merged. 
The --merge switch will still merge the old and new land parcelling.
 2011-01-27 18:48:48 +00:00
Diva Canto
0fabe0e5a5 Added more debug messages under the -verbose option. 2011-01-08 16:33:33 -08:00