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
Melanie
24c00acedc
Fix Mantis #4429 : Allow llGiveInventory to work across sim borders.
2011-05-23 02:52:28 +01:00
Diva Canto
336665e035
More on HG Friends. Added Delete(string, string) across the board. Added security to friendship identifiers so that they can safely be deleted across worlds. Had to change Get(string) to use LIKE because the secret in the identifier is not always known -- affects only HG visitors. BOTTOM LINE SO FAR: HG friendships established and deleted safely across grids, local rights working but not (yet?) being transmitted back.
2011-05-22 16:51:03 -07:00
Diva Canto
fed3cc630e
File to be removed
2011-05-22 15:35:40 -07:00
Melanie
9c1f799582
Implement llGodLikeRezObject and llGetUsedMemory
2011-05-22 21:01:31 +02:00
BlueWall
dc95e38e42
Add stubs for unimplemented lsl functions
2011-05-22 14:59:18 -04:00
Melanie
89705b19c7
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-05-22 20:00:59 +02:00
Melanie
be1996f121
Merge branch 'master' into careminster-presence-refactor
2011-05-22 20:23:25 +01:00
Diva Canto
58c53c41de
Fixed permissions bug related to friends in PermissionsModule. Added FriendsData[] GetFriends(string principalID) to IFriendsData and FriendInfo[] GetFriends(string PrincipalID) to IFriendsService. Refactored some more in the FriendsModule. Made client get notification of local friends permissions upon HGLogin. HG Friends object permissions work.
2011-05-21 16:48:00 -07:00
Diva Canto
80457111e0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-21 14:07:30 -07: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
Justin Clark-Casey (justincc)
4073f10133
rename test helpers enclosing package from Setup to Helpers
2011-05-21 00:51:34 +01:00
Justin Clark-Casey (justincc)
94553d4753
rename UserInventoryTestsUtils -> UserInventoryHelpers for consistency
2011-05-21 00:48:01 +01:00
Justin Clark-Casey (justincc)
156cc1418b
test helper rename for consistency
2011-05-21 00:44:58 +01:00
Justin Clark-Casey (justincc)
d7e5b76d73
refactor: rename AddSceneObjectItem to AddSceneObject
2011-05-21 00:39:42 +01:00
Justin Clark-Casey (justincc)
084059319c
refactor: move scene object item creation code into TaskInventoryHelpers
2011-05-21 00:37:20 +01:00
Justin Clark-Casey (justincc)
9103fe84d5
move test task inventory notecard item creation into a new TastInventoryHelpers class
2011-05-21 00:25:58 +01:00