ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-02 00:15:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,903 Commits 5 Branches 82 Tags
ee18db027c67d3ea9b905f4d07bd5a2ec8fdf65f
Commit Graph

3546 Commits

Author SHA1 Message Date
Melanie
ee18db027c Make sure state machine is reset if crossing is aborted 2013-02-23 21:00:05 +00:00
Melanie
e3ea2c4bee Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
 2013-02-23 20:37:09 +00:00
Diva Canto
d7115cfd46 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-22 15:58:06 -08:00
Diva Canto
0e8289cd00 Added new Util function for reading config vars that's more generic than the one I added yesterday -- this is for helping move config vars out of [Startup] 2013-02-22 15:57:33 -08:00
Justin Clark-Casey (justincc)
ccb7cce819 Make reset of EntityTransferStateMachine for an avatar transfer always happen despite unexpected exceptions. 
This means that if such an exception does occur, the region does not need to be reset before that user can teleport from it again.
This is all Oren's code from his patch in http://opensimulator.org/mantis/view.php?id=6374 but I've chosen to split it in two.
 2013-02-22 21:59:00 +00:00
Melanie
9534d5f929 Merge branch 'master' into careminster 2013-02-22 01:28:54 +00:00
Diva Canto
56c979afe8 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-21 17:27:03 -08:00
Diva Canto
e515cdddec Simplification of HG configs: HomeURI and GatekeeperURI now are defined as default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency. 2013-02-21 17:26:19 -08:00
Justin Clark-Casey (justincc)
9de670c550 minor: Change summary in "show appearance" console command to "incomplete" rather than "corrupt" 
Corrupt is misleading - it implies textures were uploaded but are not j2k valid.
The actual situation is that at least one required baked texture is not present.
 2013-02-21 23:08:50 +00:00
Robert Adams
16bb40229b Add flush after write feature to LogWriter 2013-02-20 16:13:49 -08:00
Justin Clark-Casey (justincc)
99ebff94b5 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-20 22:11:04 +00:00
Justin Clark-Casey (justincc)
a671c06ee5 Correct mistake in parsing 'show object pos' and similar pos commands where the 'to' text would be treat as the end vector rather than discarded. 
Before this, the commands still work but the help text is wrong - one has to leave out the 'to' in stating the vectors
 2013-02-20 22:09:33 +00:00
Diva Canto
4779f7d7d5 Deleted all AssemblyFileVersion directives 2013-02-19 17:14:55 -08:00
Melanie
192e1e7cf0 Merge branch 'master' into careminster 2013-02-16 05:37:12 +00:00
Justin Clark-Casey (justincc)
7d7736dc73 Separate IAR tests into separate files for load/save/loadpath tests 2013-02-16 01:57:42 +00:00
Justin Clark-Casey (justincc)
d54d31807a Make it so that "load iar / ..." does not save the 'root' "My Inventory" folder. 
Really "My Inventory" is just the name of the root, it isn't a folder in its own right.
This also makes it more intuitive for users to save whole inventory iars for backup/later restoration, as they don't need to remember to use /*
/* will still work and this is a special case just for the root
If you want to save only the contents of other folders (rather than the folder itself), you still need to specify something like a/b/*
Added a regression test for this case.
 2013-02-16 00:50:52 +00:00
Justin Clark-Casey (justincc)
e9cc22fea4 Add regression test TestSaveNonRootFolderToIar 2013-02-16 00:26:21 +00:00
Melanie
ea8c5ba707 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2013-02-15 21:42:16 +00:00
teravus
71862f34b6 * Handle null check on configs in module startup so that the the code can be run on 'stop on handled and unhandled null reference exceptions' mode without pausing during startup a bunch of times. I don't think exceptions were really meant for replacing a single if statement... 2013-02-14 18:52:11 -05:00
Justin Clark-Casey (justincc)
0ad07eb44d minor: remove some mono compiler warnings 2013-02-14 21:29:35 +00:00
Melanie
12971e73d4 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
 2013-02-08 23:29:47 +00:00
Justin Clark-Casey (justincc)
b08977ea7d Don't allow exceptions to propogate from FlotsamAssetCache which may occur when deleting expired files or stamping the region status file. 
Changes various error level log lines to warn since these are not fatal to the operation of OpenSimulator
 2013-02-08 21:21:20 +00:00
Justin Clark-Casey (justincc)
221a90e3a1 On IAR loading, if loading of a coaleseced item entirely fails, then continue with the IAR load rather than failing completely. 2013-02-08 02:34:13 +00:00
Melanie
8b78b9429d Merge branch 'avination' into careminster 2013-02-07 21:26:55 +00:00
Melanie
d3892bbd06 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2013-02-05 21:30:12 +00:00
Justin Clark-Casey (justincc)
1fc9f282fa Merge branch 'dynamic-attributes2' 2013-02-05 00:35:15 +00:00
Justin Clark-Casey (justincc)
1f1da23097 Bump version and assembly version numbers from 0.7.5 to 0.7.6 
This is mostly Bluewall's work but I am also bumping the general version number
OpenSimulator 0.7.5 remains in the release candidate stage.
I'm doing this because master is significantly adding things that will not be in 0.7.5
This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names
and so the exact version match requirement is not in force.
 2013-02-05 00:23:17 +00:00
Melanie
7482ad1c22 Merge branch 'master' into careminster 2013-02-04 19:21:39 +00:00
Justin Clark-Casey (justincc)
9822bb664b Log missing assets on "fcache assets" found. This ignores references found by scanning LSL/notecard files since these are the source of false positives. 
This also changes UuidGatherer to reutn an AssetType.Unknown for embedded script/lsl references instead of Texture, since these are often not textures.
This is added to help people in determining when they have missing assets such as textures, etc.
In this case, one wants to run "fcache clear" first.
 2013-02-02 02:57:38 +00:00
Justin Clark-Casey (justincc)
9588328242 Stop exceptions being thrown if GenerateMapTiles = false but no static map tile has been set. Do more informative warn instead. 2013-02-02 00:59:26 +00:00
Melanie
cfa8e9cfa7 Merge branch 'avination' into careminster 2013-01-31 20:36:20 +00:00
Melanie
e497cf6f04 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2013-01-31 20:16:45 +00:00
Dan Lake
b659ccfc80 Merge branch 'master' of git://opensimulator.org/git/opensim 2013-01-31 11:15:22 -08:00
Dan Lake
17440d8a29 Added option for UUID as command parameters. This lets the command handle the UUID parsing and type checking before the command is executed. 2013-01-31 11:14:43 -08:00
Jak Daniels
fac72d540b Allow use of MaptileStaticUUID in Regions.ini to override the global setting in OpenSim.ini for each region. 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2013-01-30 23:37:02 -05:00
Melanie
9a4de546fe Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
 2013-01-31 02:53:11 +00:00
teravus
e83893c8bc * This Checks the asset of each wearable asynchronously and repairs if it's required. 2013-01-29 06:12:04 -05:00
Justin Clark-Casey (justincc)
fd34a75cde minor: Tidy up disabled logging on AssetTransactionModule for future use. Make it clear that transaction parameter to HandleUDPUploadRequest is an ID. 2013-01-29 04:03:33 +00:00
Melanie
2a558c7346 Change default avatar replacements to be ruth rather than urban male 2013-01-28 01:20:16 +01:00
Melanie
e6e6e8ab15 Merge branch 'avination' into careminster 2013-01-27 01:09:07 +00:00
Melanie
c3d68e7f9d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
 2013-01-27 01:09:01 +00:00
Melanie
776cc33541 Prevent items being destroyed by rename operations. Renaming of a wearable also 
sends an asset transaciton but it is empty. So we can't ignore name data
when a transaction is present and can't treat every transaction as valid.

Conflicts:

	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
 2013-01-27 01:07:37 +00:00
Melanie
380b017e32 Prevent items being destroyed by rename operations. Renaming of a wearable also 
sends an asset transaciton but it is empty. So we can't ignore name data
when a transaction is present and can't treat every transaction as valid.
 2013-01-27 00:20:34 +01:00
Melanie
8f949513fd Merge branch 'master' into careminster 2013-01-26 16:58:02 +00:00
teravus
564b513963 * This update is ugly as sin, but it 'fills in the blanks' of your appearance when your inventory items go missing. This repairs appearance from missing wearables immediately on the V1 appearance pipeline, the second login on Firestorm. It only replaces the essential body parts that are missing.. hair, skin, eyes, shape... so if you delete all your wearables, you will rez naked. Anyway, this is still experimental.. I need another day of playing with this to handle all of the situations. One thing that I still need to do is try and get the assets.. and if we can't get the assets for some reason, skip and replace that part of the outfit. 2013-01-26 07:31:54 -05:00
Justin Clark-Casey (justincc)
b0cff35d96 Fix issue where the "set terrain texture" console command did not tell the viewers that textures had updated (hence they did not display the changes). 
Addresses http://opensimulator.org/mantis/view.php?id=6513
 2013-01-26 04:27:01 +00:00
Melanie
e28c042dce Merge branch 'master' into careminster 2013-01-26 01:56:23 +00:00
Justin Clark-Casey (justincc)
c3fb114461 minor: Fix full scene part console report to show proper Light* names rather than all wrongly FlexiDrag 2013-01-26 00:31:50 +00:00
Oren Hurvitz
6daf559fb6 Added unit tests for Dynamic Attributes 2013-01-25 04:03:30 +00:00
Oren Hurvitz
23f0610f0c Disabled DAExampleModule 2013-01-25 04:03:28 +00:00