Justin Clark-Casey (justincc)
6f4a2685cf
minor: remove mono compiler warning
2011-05-27 23:43:31 +01:00
Justin Clark-Casey (justincc)
28cd03cda5
fix bug where generic sqlite table delete wasn't working.
...
this would have caused dupe links bugs when using the sqlite adaptor
2011-05-27 22:54:59 +01:00
Diva Canto
44d5821c4e
Fixed one comment in a config file.
2011-05-27 13:35:22 -07:00
Justin Clark-Casey (justincc)
b0c9696de0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-27 21:21:01 +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
Diva Canto
fcef4688a8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-27 13:07:39 -07:00
Diva Canto
76525be7b2
HG lures working! Friends can offer friends HG teleports via the profile. WARNING: additional configuration for HG inis -- see *Common.ini.example
2011-05-27 13:07:18 -07:00
Justin Clark-Casey (justincc)
4e4db749eb
If parsing fails in the primitive base shape (which prints out a debug log message), also print out the name and uuid of the part containing this shape.
...
This is to help in diagnosing parsing failures.
2011-05-27 20:59:35 +01:00
Justin Clark-Casey (justincc)
0af5bb239f
When saving an iar, don't chase down link asset IDs (since these points to other items rather than real assets)
...
This bug had no practical effect other than to make "save iar" misreport the number of missing assets
2011-05-27 19:39:03 +01:00
Diva Canto
4087a453dc
Avoid a scary warning message about null replies from the user agent service.
2011-05-27 08:53:26 -07:00
Diva Canto
d60f525baa
HG inventory transfers over the profile working.
2011-05-27 08:19:40 -07:00
Diva Canto
36f9d55c36
Added a BasicProfilemodule so that the profile-based actions (like give inventory, etc) work. This is just a mock profile, the same for all users, and with no DB backend behind it -- meaning that nothing will be saved. For serious profiles, use 3rd party implementations.
2011-05-27 07:00:36 -07:00
Diva Canto
31d07859f9
Added missing config vars to StandaloneCommon.ini.example and fixed the ones in Robust.HG.ini.example
2011-05-26 19:43:24 -07:00
Diva Canto
abae859e7a
Added missing configuration variables to Robust.HG.ini.example
2011-05-26 19:20:29 -07:00
Diva Canto
07acb4d321
Last commit before pushing. WARNING: (a) DB migration on the friends table; and (b) several config additions related to HG. See Robust.HG.ini.example, GridCommon.ini.example and/or StandaloneCommon.ini.example.
2011-05-26 19:15:39 -07:00
Diva Canto
0d29f73916
Commented a few extra debug messages.
2011-05-26 19:13:03 -07:00
Melanie
f02fbdbc68
Merge branch 'master' into careminster-presence-refactor
2011-05-27 01:10:02 +01:00
Melanie
5cbb203efb
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-05-27 01:05:02 +01:00
Diva Canto
b17afe43c4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-26 15:52:34 -07:00
Diva Canto
0c58a9e680
HG IM in grid mode working fairly well. Unknown target user references looked back in source user's User Agent service.
2011-05-26 10:04:48 -07:00
Melanie
3e54aad76c
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-05-26 16:29:45 +02:00
Melanie
4d324f1b74
Change setter on changed flags to public so modules can reset it
2011-05-26 16:29:00 +02:00
Tom
03525959c9
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-05-26 03:42:45 -07:00
Tom
b000d9ba72
Some additional protection, it seems that responsedata needs to be locked, but I can't immediately see where it's being accessed from another thread. For now, this will protect the server
2011-05-26 03:42:01 -07:00
Justin Clark-Casey (justincc)
91ec1a572a
improve help information for "appearance show"
...
at the moment, this just performs a baked avatar check for everybody in the region. If the check returns 'corrupt' then a baked texture is missing and other avatars will continue to see the gas ball.
2011-05-26 02:48:47 +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)
ab855e6f8d
fix bug where outfit folder links could not be deleted
2011-05-26 01:32:36 +01:00
Justin Clark-Casey (justincc)
d9889ae2e7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-26 01:28:48 +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
Diva Canto
587b17e23b
HG: Renamed, shuffled some interfaces around. Move them all to IHypergridServices.
2011-05-25 12:37:37 -07:00
Diva Canto
5c2168cae7
HG: Instant Message working. Tested on HG standalones only. Needs a lot more testing.
2011-05-25 12:32:21 -07:00
Melanie
38ef8ba430
Merge branch 'master' into careminster-presence-refactor
2011-05-25 12:17:59 +01:00
Melanie
e398c33648
Add PayPrice to serialization format Xml2
2011-05-25 12:17:46 +01:00
Melanie
932db1c374
Add PayPrice to serialization format Xml2
2011-05-25 11:30:21 +02:00
BlueWall
ef3f6b4e63
Revert "Make client event handlers for money only work on root agents"
...
This reverts commit a8913141c0
.
Pulling this back until some testing under various money
modules can be done. Need to be able to make purchases as
a child agent.
2011-05-24 16:33:51 -04:00
BlueWall
a8913141c0
Make client event handlers for money only work on root agents
2011-05-24 16:07:48 -04:00
Diva Canto
e19031849e
Added necessary code to drop inventory on hg friends using the profile window, but can't test because this mechanism doesn't seem to work without a profile service.
2011-05-24 09:38:03 -07:00
Melanie
1b106c3928
Merge branch 'master' into careminster-presence-refactor
2011-05-24 04:04:16 +01:00
Melanie
28c25d8477
Allow disabling the legacy backup mechanism to avoid the object clone if
...
backup is not used.
2011-05-24 04:03:51 +01:00
Melanie
d1870d0c47
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-05-24 04:03:36 +01:00
Melanie
3612ce4888
Merge branch 'master' into careminster-presence-refactor
2011-05-24 04:03:08 +01:00
Diva Canto
24f28d3534
HG friends: Status notifications working. Also initial logins get the online friends in other grids.
2011-05-23 19:45:39 -07:00
Melanie
61d4291da5
Create a method to force the script engine to save state from outside
2011-05-24 03:17:12 +01:00
Melanie
4b088dca69
Merge branch 'master' into careminster-presence-refactor
2011-05-24 03:11:51 +01:00
Melanie
62e0c96036
Allow disabling the legacy backup mechanism to avoid the object clone if
...
backup is not used.
2011-05-24 03:37:25 +02:00
Melanie
d5841e07c2
Create a method to force the script engine to save state from outside
2011-05-24 02:40:59 +02:00
Melanie
178d541dca
Add an event for an orderly region shutdown that fires once per region before
...
the SceneGraph is torn down.
2011-05-24 01:19:48 +01:00
Melanie
8b42f824d3
Add an event for an orderly region shutdown that fires once per region before
...
the SceneGraph is torn down.
2011-05-24 00:53:28 +02:00
Melanie
b9fb7cdf9f
Merge branch 'master' into careminster-presence-refactor
2011-05-23 03:39:20 +01:00