61a49ec4a8
Initialize InventoryItemBase.creatorData properly. Could throw.
2010-11-23 06:36:57 -08:00
2527aeb40c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-23 14:03:52 +00:00
45b08a9ce3
Fix more potential nullrefs
2010-11-23 14:02:20 +00:00
7796b90ebb
Fix some crashes caused by the addition of the CreatorData column
2010-11-23 14:02:06 +00:00
87e565d28d
Merge branch 'master' of /var/git/opensim/
2010-11-23 03:00:09 -08:00
c68f03a6ff
Fix: Allow use of parameters without specifying a file path with command "save oar"
2010-11-23 11:45:12 +01:00
ba2bf78dcf
Fix joining land parcels not being stored correctly in SQLite. Thank you to goetz for the initial patch in Mantis #5230 .
2010-11-23 11:45:12 +01:00
64918589ec
Merge branch 'master' of /var/git/opensim/
2010-11-22 20:30:06 -08:00
8d79a39d5b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-23 04:27:06 +00:00
63170fdea7
Only perform the take object permissions check if an object is being attached directly from the scene, not from existing inventory
2010-11-23 04:26:07 +00:00
bbc291dfdf
adapt tests to use DeRezObjects() since DeRezObject() has recently disappeared
2010-11-22 23:07:30 +00:00
34b13a4765
add basic tests to check that under default permissions module owner can delete objects and that non-owners (who are also not administrators, etc.) cannot
2010-11-22 22:54:13 +00:00
9362d11077
Merge branch 'master' of /var/git/opensim/
2010-11-22 10:40:03 -08:00
e1c72cedb3
Let CHANGED_SCALE also trigger when editing prims and linksets with the viewer's edit tools.
...
This event used to trigger only when the scale was changed with a script.
2010-11-22 19:38:44 +01:00
d63965cf94
Let CHANGED_SHAPE trigger. This fixes Mantis #1844 .
2010-11-22 19:38:44 +01:00
7e862dfe5e
Merge branch 'master' of /var/git/opensim/
2010-11-22 07:30:05 -08:00
f9f386f73b
Merge branch 'master' of /var/git/opensim/
2010-11-22 07:20:08 -08:00
d2aebbe066
Fox case on a method
2010-11-22 14:27:45 +00:00
4e0a289a8d
Change FS Voice module to a shared module to avoid gratuitious server handler
...
registrations. Add the missing bits to drive the local connector's HTTP
requests. This makes standalones work.
2010-11-22 14:13:27 +00:00
d272a5bd25
Merge branch 'master' of /var/git/opensim/
2010-11-22 02:20:10 -08:00
8a2c365e5b
Thank you, thomax, for a patch making changed events CHANGED_REGION_RESTART and CHANGED_REGION work.
...
Fixes Mantix #5214 .
2010-11-22 10:39:46 +01:00
b7f5e82843
Merge branch 'master-core' into mantis5110
2010-11-21 20:01:48 -08:00
562147475c
Merge https://github.com/opensim/opensim into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2010-11-21 19:51:23 -08:00
f01e1094a3
Merge branch 'master' of /var/git/opensim/
2010-11-21 17:50:03 -08:00
c913f92f0f
Merge branch 'master' of /var/git/opensim/
2010-11-21 17:30:05 -08:00
0fec29c849
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-21 17:19:45 -08:00
c617d658dd
Added creator info across the board -- TaskInventoryItems and InventoryItems themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being.
...
New migration in inventory table in order to make CreatorID varchar(255).
2010-11-21 17:19:24 -08:00
a1549a1d85
Merge branch 'master' of /var/git/opensim/
2010-11-21 16:50:03 -08:00
8466ada8e0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-22 00:46:37 +00:00
ddf08276f1
Fox the buglets in Freeswitch. Grid mode works now and there is no reason why standalone should not.
2010-11-22 00:46:23 +00:00
e2e828d1d5
Merge branch 'master' of /var/git/opensim/
2010-11-21 16:30:05 -08:00
a145a294cf
Merge branch 'master' of /var/git/opensim/
2010-11-21 15:50:03 -08:00
c85e6bc36d
Add the remote connector for freeswitch config retrieval
2010-11-21 23:42:52 +00:00
dd67175edf
Merge branch 'master' of /var/git/opensim/
2010-11-21 15:40:03 -08:00
3d113e9f1d
Merge branch 'master' of /var/git/opensim/
2010-11-21 15:30:05 -08:00
2105842513
Finish the standalone mode freeswitch work and add config examples
2010-11-21 23:24:39 +00:00
b4025eb48e
Merge branch 'master' of /var/git/opensim/
2010-11-21 15:20:02 -08:00
a7174cecdd
Remove username and password from the publicly accessible FS config
2010-11-21 22:45:04 +00:00
68e8e35640
Merge branch 'master' of /var/git/opensim/
2010-11-21 14:40:08 -08:00
6fa24f4671
Convert the Freeswitch module to new style
2010-11-21 22:40:03 +00:00
d0c764bf2e
Merge branch 'master' of /var/git/opensim/
2010-11-21 14:30:10 -08:00
e6c52f38c5
Strip the dialplan and directory methods from the region module
2010-11-21 22:25:50 +00:00
2b0ef9ad1d
Implement a method to allow regions to query the gridwide Freeswitch
...
configuration from ROBUST
2010-11-21 22:17:25 +00:00
b43a01179e
Correct an error in Robust.ini.example
2010-11-21 21:35:31 +00:00
af8c8197ab
Updated SQLiteLegacy/SQLiteSimulationData with the same. Is this crap still used?!?
2010-11-21 13:29:20 -08:00
ed5f91c638
Move Dialplan and Directory from the region module to the ROBUST server
2010-11-21 21:29:17 +00:00
c0ccfeebe7
Start implementing Freeswitch in ROBUST
2010-11-21 21:29:11 +00:00
51343caeb5
Updated SQLite/SQLiteSimulationData to use SOP.CreatorInformation instead of SOP.CreatorID. Untested, but should work.
2010-11-21 13:27:03 -08:00
6a9ae9e7cb
Global creator information working on MySQL DB and on load/save OARs. Creator name properly shown on the viewer as first.last @authority.
...
New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars.
Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule.
2010-11-21 13:16:52 -08:00
d04cbd8f85
Merge branch 'master' of /var/git/opensim/
2010-11-19 19:10:12 -08:00
Diva Canto