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
22ff06ba17
Merge branch 'master' into careminster-presence-refactor
2010-11-22 01:09:26 +00: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
7e9a3019ac
Fox the buglets in Freeswitch. Grid mode works now and there is no reason why standalone should not.
2010-11-22 00:55:11 +01:00
a145a294cf
Merge branch 'master' of /var/git/opensim/
2010-11-21 15:50:03 -08:00
8d7b181b58
Merge branch 'master' into careminster-presence-refactor
2010-11-21 23:47:28 +00:00
c85e6bc36d
Add the remote connector for freeswitch config retrieval
2010-11-21 23:42:52 +00:00
5f8a0f3d1f
Add the remote connector for freeswitch config retrieval
2010-11-21 23:41:56 +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
83a427a8f9
Move Dialplan and Directory from the region module to the ROBUST server
2010-11-21 21:18:03 +00: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
1cf8eb8a90
Start implementing Freeswitch in ROBUST
2010-11-21 20:59:01 +00:00
d04cbd8f85
Merge branch 'master' of /var/git/opensim/
2010-11-19 19:10:12 -08:00
f1151f20dc
Fix global region coordinates that are delivered by llRequestSimulatorData.
...
Also did some source code clean-up by replacing literals with constants.
2010-11-20 03:03:11 +00:00
a88bcbb118
Knock V0_2 decals off archive tests since they're misleading
2010-11-20 03:01:47 +00:00
d7bca3d8e8
Fix unit tests and save problems
...
(note; contrary to previous commits, saving 0.4 OARs is actually broken since serialized objects in inventories are not yet converted properly).
Firstly, if you can save a version 1.0 OAR then you can load it too.
Secondly, closing the save stream even on success before assets/objects are saved is a bad idea
2010-11-20 02:59:21 +00:00
c4dd724cba
Merge branch 'master' of /var/git/opensim/
2010-11-19 18:50:05 -08:00
1087d6042b
correct build break. for some reason, xbuild didn't rebuild test dlls
2010-11-20 02:43:38 +00:00
4ec0933c99
Merge branch 'master' of /var/git/opensim/
2010-11-19 18:40:08 -08:00
f49e32bfaa
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-20 02:34:27 +00:00
2c7be7130e
Bump oar version to 1.0 from 0.5
...
If oar contents are being changed such that older versions of opensim can't load them, then the major version must be increased
This also locks version parameters to either 1.0 or 0.4, so that arbitrary 'versions' cannot be saved
Also closes save stream properly in the event of an error
Version 1.0 OARs are currently incompatible with OpenSim 0.7.0.2 and earlier. However, you can still save compatible version 0.4 OARs by specifing --version=0 on the save oar command line
e.g. save oar --version=0 oars/test.oar
2010-11-20 02:32:12 +00:00
2750e22782
Merge branch 'master' of /var/git/opensim/
2010-11-18 12:10:08 -08:00
164007dd00
Merge branch 'master' into careminster-presence-refactor
2010-11-18 19:06:09 +00:00
8f1a79420b
Fixed appearance send for avatars with only default textures. This should fix some of the appearance problems on osgrid. Also added a transaction lock on SetAppearance. This won't prevent concurrent access to Appearance but it will at least make sure each update completes.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-18 19:04:50 +00:00
f3e4000a55
Send media and other parcel data to client on login. Makes streams visible
...
right away and starts media.
2010-11-18 13:26:35 +01:00
47f0468995
Send parcel data upon becoming root. This will make streams play and build
...
flags be set properly
2010-11-18 04:18:43 +01:00
095e3aae67
Allow llDialog without any buttons and add the automatic OK button as it is
...
in SL.
2010-11-18 01:11:11 +01:00
b5160aade0
Merge branch 'master' of /var/git/opensim/
2010-11-17 16:00:05 -08:00
Jonathan Freedman