Melanie
0f1a3f8ed2
Merge branch 'master' into careminster
2010-02-03 00:16:02 +00:00
Melanie
fa121951d2
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-02-03 00:15:14 +00:00
radams1
88d0fc3b09
allow terrain collision events after regular collision check
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-03 00:15:04 +00:00
Justin Clark-Casey (justincc)
bbd41de6d5
refactor: move world comm message queueing into its own method
2010-02-02 20:38:58 +00:00
Justin Clark-Casey (justincc)
0faeaf98a6
minor: copy some method doc from the WorldComm implementation to the interface
2010-02-02 19:42:45 +00:00
Justin Clark-Casey (justincc)
dc82409106
minor: add method doc to sop.SetScriptEvents()
2010-02-02 19:04:06 +00:00
Kitto Flora
8c20610293
AngMotor update 1
2010-02-02 13:28:42 -05:00
Justin Clark-Casey (justincc)
0e23c5fffb
minor: add some documentation to EventManager.OnObjectGrab
2010-02-02 18:19:15 +00:00
Justin Clark-Casey (justincc)
96d5c8196a
minor: add reminder to lock SOG.Children before using it directly in order to avoid threading issues
2010-02-02 15:45:41 +00:00
Melanie
d5ed92cf38
Merge branch 'master' into careminster
2010-02-02 03:56:29 +00:00
Melanie
6478617c93
Revert "improve locking of m_items in SceneObjectPartInventory"
...
This reverts commit 968b9e160d
.
2010-02-02 03:49:00 +00:00
Diva Canto
4eeddf3078
Bug fix for finding default regions if the specified one doesn't exist.
2010-02-01 16:52:42 -08:00
Diva Canto
bb736cee6b
Beginning of friends.
2010-02-01 16:05:59 -08:00
Justin Clark-Casey (justincc)
08721be374
minor: rename GetScriptPrimType() to GetPrimType()
2010-02-01 22:33:15 +00:00
Justin Clark-Casey (justincc)
5432925a3b
move hollow sphere faces bug back up to LSL_Api.cs
2010-02-01 22:29:21 +00:00
Justin Clark-Casey (justincc)
ecc068fbe0
remove now duplicated shape code from LSL_Api.cs
2010-02-01 22:08:00 +00:00
Justin Clark-Casey (justincc)
3863cd1d23
Copy prim face color setting code from LSL_Api down into SOP so that non-LSL callers can use it
2010-02-01 21:35:05 +00:00
Justin Clark-Casey (justincc)
4c1740f7d8
Actually make EventManager.OnAttach() fire when an object is attached. Previously, only detach was firing!
2010-02-01 20:15:36 +00:00
Justin Clark-Casey (justincc)
53a01dc422
Don't try to start attachment scripts or send updates if the attachment itself has been unsuccessful
2010-02-01 20:06:43 +00:00
Diva Canto
8466f13976
Bug fix for getting region flags.
2010-02-01 07:53:55 -08:00
Diva Canto
7896965d71
Batter debug messages.
2010-01-31 22:40:06 -08:00
Diva Canto
35a245b67a
Assorted bug fixes related to hyperlinking
2010-01-31 22:35:23 -08:00
Diva Canto
35de8e91ec
* Remove unnecessary debug message
...
* Bug fix in UserAgentService, logout
2010-01-31 17:27:56 -08:00
Diva Canto
0b89afd3e5
* Simplified the configuration by having [DatabaseService] in it
...
* Fixed configuration issue for HGInventoryServerInConnector
* Corrected typos in debug messages
2010-01-31 14:37:22 -08:00
Diva Canto
a6b50c2436
In HG, add asset service handlers to 8002, to make it even easier.
2010-01-31 14:07:26 -08:00
Diva Canto
af758ea164
* More config cleanup
...
* Added different ports (8002 and 8003) to the many services in OpenSim.Server.ini.example
* Added a separate OpenSim.Server.HG.ini.example to make it easier to run
2010-01-31 14:01:47 -08:00
Diva Canto
823b9607e2
Can't comment [Network] even if it's not used.
2010-01-31 13:19:03 -08:00
Diva Canto
67b0fcf806
* Added OpenSim.Server.HG.ini as an add-on to OpenSim.Server.ini
...
* Cleaned up standalone configs
2010-01-31 13:07:13 -08:00
Diva Canto
041594ed07
Cleaned up configuration. 'gridmode' and 'hypergrid' are gone, as well as lots of other obsolete configs.
2010-01-31 13:01:23 -08:00
Diva Canto
22a3ad7f6c
* Bug fix in XInventoryData -- groupOwned is an int in the DB
...
* Bug fix in InventoryServerInConnector -- m_config
2010-01-31 11:26:12 -08:00
Diva Canto
40d8e91008
* Added a few files that were missing in the repo.
...
* New HGInventoryService which allows restricted access to inventory while outside
2010-01-31 11:10:57 -08:00
Diva Canto
0473454876
Added missing file.
2010-01-31 11:04:32 -08:00
Diva Canto
a2096f58ce
Updated gridhypergrid config.
2010-01-30 17:41:01 -08:00
Diva Canto
3112b04c85
Changed an error message to w warning message.
2010-01-30 16:18:38 -08:00
Diva Canto
1ab8458b1c
Bug fix for making cross-grid login work.
2010-01-30 16:09:40 -08:00
Diva Canto
a0d79e621c
Bug fix: change HGBroker to a INonSharedRegionModule
2010-01-30 15:43:10 -08:00
Diva Canto
42f978a478
* HGScene is no more.
...
* Moved a few key inventory access methods from Scene.Inventory to an IInventoryAccessModule module
2010-01-30 09:23:07 -08:00
Diva Canto
81a6f9a515
On the way to making HG inventory work. Inventory can now be accessed again. Assets are still broken.
2010-01-29 19:33:50 -08:00
Diva Canto
5001f61c08
* HGGridConnector is no longer necessary.
...
* Handle logout properly. This needed an addition to IClientAPI, because of how the logout packet is currently being handled -- the agent is being removed from the scene before the different event handlers are executed, which is broken.
2010-01-29 18:59:41 -08:00
Justin Clark-Casey (justincc)
4c1365f149
apply http://opensimulator.org/mantis/view.php?id=4486
...
fix compilation of mrm scripts using microthreaded parmeter
Thanks ziah
2010-01-30 00:15:37 +00:00
Justin Clark-Casey (justincc)
627df50646
Apply http://opensimulator.org/mantis/view.php?id=4504
...
Stop the REST console crashing when entering return on an empty line
Thanks BlueWall
2010-01-29 23:38:44 +00:00
Justin Clark-Casey (justincc)
05a3e37b85
Apply http://opensimulator.org/mantis/view.php?id=3334
...
Send continuous touch() events if the left mouse button is held down while moving over an object
This conforms with Linden Lab practice
Thanks Revolution
2010-01-29 23:12:08 +00:00
Justin Clark-Casey (justincc)
7b53067d6d
Apply http://opensimulator.org/mantis/view.php?id=4548
...
Fix command params check on fcache expire <datetime>
Thanks coyled
2010-01-29 21:52:13 +00:00
Justin Clark-Casey (justincc)
0cf88b34c9
use common sop2 setup for TestMergeOarV0_2()
2010-01-29 21:45:07 +00:00
Justin Clark-Casey (justincc)
68c7218fa1
make TestSaveOarV0_2() use a common part2 construction
2010-01-29 21:42:27 +00:00
Justin Clark-Casey (justincc)
0c3043a298
use common part1 createio nin TestMergeOarV0_2()
2010-01-29 21:37:25 +00:00
Justin Clark-Casey (justincc)
055d991cc1
minor: swap which part uses the automatically set up scene in TestMergeOarV0_2()
2010-01-29 21:33:11 +00:00
Justin Clark-Casey (justincc)
75dcd721de
use common part1 creation in ArchiverTests.TestLoadOarV0_2()
2010-01-29 21:27:14 +00:00
Justin Clark-Casey (justincc)
115e66218e
refactor out scene object 1 creation n ArchiverTetss
2010-01-29 21:10:14 +00:00
Justin Clark-Casey (justincc)
c1da07e4eb
factor out scene setup in ArchiverTests
2010-01-29 20:59:56 +00:00