Melanie
|
2527aeb40c
|
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
|
2010-11-23 14:03:52 +00:00 |
|
Melanie
|
3caea83e9a
|
Merge branch 'master' into careminster-presence-refactor
|
2010-11-23 14:03:33 +00:00 |
|
Melanie
|
45b08a9ce3
|
Fix more potential nullrefs
|
2010-11-23 14:02:20 +00:00 |
|
Melanie
|
7796b90ebb
|
Fix some crashes caused by the addition of the CreatorData column
|
2010-11-23 14:02:06 +00:00 |
|
opensim mirror account
|
87e565d28d
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-23 03:00:09 -08:00 |
|
Marck
|
c68f03a6ff
|
Fix: Allow use of parameters without specifying a file path with command "save oar"
|
2010-11-23 11:45:12 +01:00 |
|
Marck
|
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 |
|
opensim mirror account
|
64918589ec
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-22 20:30:06 -08:00 |
|
Justin Clark-Casey (justincc)
|
8d79a39d5b
|
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
|
2010-11-23 04:27:06 +00:00 |
|
Justin Clark-Casey (justincc)
|
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 |
|
Melanie
|
4a54b3318b
|
Fix more potential nullrefs
|
2010-11-23 00:31:09 +01:00 |
|
Justin Clark-Casey (justincc)
|
bbc291dfdf
|
adapt tests to use DeRezObjects() since DeRezObject() has recently disappeared
|
2010-11-22 23:07:30 +00:00 |
|
Justin Clark-Casey (justincc)
|
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 |
|
Melanie
|
571becefb6
|
Fix some crashes caused by the addition of the CreatorData column
|
2010-11-22 23:31:29 +01:00 |
|
opensim mirror account
|
9362d11077
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-22 10:40:03 -08:00 |
|
Marck
|
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 |
|
Marck
|
d63965cf94
|
Let CHANGED_SHAPE trigger. This fixes Mantis #1844.
|
2010-11-22 19:38:44 +01:00 |
|
opensim mirror account
|
7e862dfe5e
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-22 07:30:05 -08:00 |
|
opensim mirror account
|
f9f386f73b
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-22 07:20:08 -08:00 |
|
Melanie
|
d2aebbe066
|
Fox case on a method
|
2010-11-22 14:27:45 +00:00 |
|
Melanie
|
506192e466
|
Make an invalud key string in llTextBox and llDialog non fatal to avoid
breakinf sloppily made no-mod scripted items.
|
2010-11-22 15:16:28 +01:00 |
|
Melanie
|
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 |
|
Melanie
|
54d1d6d917
|
Fox case on a method
|
2010-11-22 14:32:51 +01:00 |
|
Melanie
|
87f30709a2
|
Merge branch 'master' into careminster-presence-refactor
|
2010-11-22 14:14:45 +00:00 |
|
opensim mirror account
|
d272a5bd25
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-22 02:20:10 -08:00 |
|
Marck
|
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 |
|
Jonathan Freedman
|
b7f5e82843
|
Merge branch 'master-core' into mantis5110
|
2010-11-21 20:01:48 -08:00 |
|
Jonathan Freedman
|
562147475c
|
Merge https://github.com/opensim/opensim into mantis5110
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
|
2010-11-21 19:51:23 -08:00 |
|
opensim mirror account
|
f01e1094a3
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-21 17:50:03 -08:00 |
|
opensim mirror account
|
c913f92f0f
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-21 17:30:05 -08:00 |
|
Diva Canto
|
0fec29c849
|
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
|
2010-11-21 17:19:45 -08:00 |
|
Diva Canto
|
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 |
|
Melanie
|
22ff06ba17
|
Merge branch 'master' into careminster-presence-refactor
|
2010-11-22 01:09:26 +00:00 |
|
opensim mirror account
|
a1549a1d85
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-21 16:50:03 -08:00 |
|
Melanie
|
8466ada8e0
|
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
|
2010-11-22 00:46:37 +00:00 |
|
Melanie
|
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 |
|
opensim mirror account
|
e2e828d1d5
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-21 16:30:05 -08:00 |
|
Melanie
|
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 |
|
opensim mirror account
|
a145a294cf
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-21 15:50:03 -08:00 |
|
Melanie
|
8d7b181b58
|
Merge branch 'master' into careminster-presence-refactor
|
2010-11-21 23:47:28 +00:00 |
|
Melanie
|
c85e6bc36d
|
Add the remote connector for freeswitch config retrieval
|
2010-11-21 23:42:52 +00:00 |
|
Melanie
|
5f8a0f3d1f
|
Add the remote connector for freeswitch config retrieval
|
2010-11-21 23:41:56 +00:00 |
|
opensim mirror account
|
dd67175edf
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-21 15:40:03 -08:00 |
|
opensim mirror account
|
3d113e9f1d
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-21 15:30:05 -08:00 |
|
Melanie
|
2105842513
|
Finish the standalone mode freeswitch work and add config examples
|
2010-11-21 23:24:39 +00:00 |
|
opensim mirror account
|
b4025eb48e
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-21 15:20:02 -08:00 |
|
Melanie
|
a7174cecdd
|
Remove username and password from the publicly accessible FS config
|
2010-11-21 22:45:04 +00:00 |
|
opensim mirror account
|
68e8e35640
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-21 14:40:08 -08:00 |
|
Melanie
|
6fa24f4671
|
Convert the Freeswitch module to new style
|
2010-11-21 22:40:03 +00:00 |
|
opensim mirror account
|
d0c764bf2e
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-21 14:30:10 -08:00 |