Melanie Thielker
06adbc1324
Revert "Workaround for mono bug #312968"
...
This reverts commit f2e343d530
.
Doesn't compile with our version of Mono. Patched Mono instead.
2010-09-06 17:24:10 +02:00
Melanie Thielker
f2e343d530
Workaround for mono bug #312968
2010-09-06 14:09:46 +02:00
Melanie Thielker
0246edc2ea
Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because
...
modules need to see it (Search!) even if it comes in via CAPS
2010-09-06 04:09:51 +01:00
Melanie Thielker
00a23eea0e
Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because
...
modules need to see it (Search!) even if it comes in via CAPS
2010-09-06 03:59:48 +02:00
Melanie
b9c20fbaa7
Merge branch 'master' into careminster-presence-refactor
2010-09-05 19:15:49 +01:00
Melanie
7f9f9f9246
Fix a handful of copypaste errors
2010-09-05 19:14:45 +01:00
Melanie
1b770d3afc
Change UserAccountService to match
2010-09-05 19:09:30 +01:00
Melanie
4243701d22
Make Simian profiles respect the module chosen in [Profile]
2010-09-05 19:06:50 +01:00
Melanie
55d3c98917
Fix up presence connector in SimianGrid
2010-09-05 18:24:16 +01:00
Melanie
0ca48b2486
Fix up Simian inentory
2010-09-05 18:14:31 +01:00
Melanie
b2486df67c
Friends works differently, it' snot even a region module at all, but a connector
...
that is loaded by the core friends module. Change Simian to match.
2010-09-05 18:06:42 +01:00
Melanie
1238b27d64
And the avatar services :)
2010-09-05 17:53:15 +01:00
Melanie
a407ad38f6
Add the m_Enabled pattern to Simian Auth
2010-09-05 17:44:02 +01:00
Melanie
d9e9c41e13
Add m_Enabled pattern to SimianGridConnector
2010-09-05 17:34:51 +01:00
Melanie
4025b85a07
As an exmple, add the code to disable connectors intot he simian asset
...
connector
2010-09-05 17:24:05 +01:00
Melanie
64ec14c8c4
Add missing IDwellModule interface
2010-09-05 17:08:57 +01:00
Melanie
09c75b30f3
Fix build break
2010-09-05 16:45:24 +01:00
Melanie
e4c2b44e5c
Merge branch 'master' into careminster-presence-refactor
2010-09-05 15:06:00 +01:00
Melanie Thielker
6a0a878f7c
Remove "Dwell" support from core and replace it with calls to methods
...
on IDwellModule
2010-09-05 14:28:33 +01:00
Melanie Thielker
e593607171
Remove "Dwell" support from core and replace it with calls to methods
...
on IDwellModule
2010-09-05 14:16:42 +02:00
Diva Canto
68f107b27e
Logout the presence if client IP verification fails.
2010-09-04 18:46:27 -07:00
Diva Canto
953a487f5e
One more debug message to track an issue on Danger grid.
2010-09-04 18:09:17 -07:00
Diva Canto
9fd9836841
Make User Agent Service and Login Service separable.
2010-09-04 16:39:03 -07:00
BlueWall
1e44ec84bd
Build system upgrade:
...
Upgrading Prebuild.exe to correctly construct build solutions
for crossplatform tools such as xbuild, monodevelop and nant.
NOTE: Module prebuild files will need modification to work,
as the prebuild must correctly define the reference path for
all assemblies shipped in the OpenSimulator ./bin directory.
These include assemblies such as XMLRPC.dll, OpenMetaverse.dll,
Nini.dll, etc. . The entries should follow the form:
<Reference name="Nini" path="../../../bin/"/>
See the distributed prebuild.xml for further examples.
Crossplatform tools: xbuild and monodevelop use the
vs2008 OpenSim.sln and the .csproj files in each namespace.
Changes to the Prebuild.exe are against svn 322 and are included
in a patch attached to the mantis. And the dnpb source are
available@ svn co https://dnpb.svn.sourceforge.net/svnroot/dnpb dnpb
The patches are pending application by the dnpb team. After which,
the un-modified upstream Prebuild.exe will work as expected.
2010-09-04 02:12:21 +01:00
Justin Clark-Casey (justincc)
c0b16f09bf
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-04 01:38:11 +01:00
Justin Clark-Casey (justincc)
1e8e98a07f
Move code that allows llGiveInvetory() to move item into appropriate system folder up from connectors into Scene.Inventory.cs
...
This fixes the problem for all architectures (hg as well as local and grid) and means we don't have to dupe code between connectors.
Not ideal in that it becomes non-modular, but methods in Scene.Inventory.cs should eventually be modularized anyway.
2010-09-04 01:36:26 +01:00
Diva Canto
8fc68c6d98
Added XFF header processing. Untested, for lack of proxy.
2010-09-03 17:18:53 -07:00
Justin Clark-Casey (justincc)
107052b23d
Create Scene.Inventory.cs.AddInventoryItem(InventoryItemBase item)
...
The agentID in AddInventoryItem(UUID agentID, InventoryItemBase item) is redundant since it's contained in item.Owner, and it doesn't make sense for agentID != item.Owner, hence the method is deprecated.
2010-09-04 00:09:53 +01:00
Justin Clark-Casey (justincc)
d4b572d2a5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 23:29:59 +01:00
Justin Clark-Casey (justincc)
63617c79d8
minor: remove mono compiler warnings
2010-09-03 23:29:39 +01:00
John Hurliman
1e552e88e8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 14:50:42 -07:00
John Hurliman
fc062a23af
Make SimianFriendsServiceConnector initialize like the other connectors and gracefully handle the case where it is loaded but disabled #monoaddinslol
2010-09-03 14:50:26 -07:00
Justin Clark-Casey (justincc)
b8da15c104
In RemoveAdminPlugin, use a .ini file template in XmlRpcCreateRegionMethod rather than an older XML one
...
This is a patch from http://opensimulator.org/mantis/view.php?id=4973 . Thanks randomhuman
2010-09-03 22:38:40 +01:00
Justin Clark-Casey (justincc)
9b95bd259f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 22:27:01 +01:00
Justin Clark-Casey (justincc)
fe63fad394
minor: remove mono compiler warning
2010-09-03 22:26:15 +01:00
John Hurliman
83f6550bcc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 13:37:30 -07:00
John Hurliman
aadbffffb1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 13:36:59 -07:00
John Hurliman
4f79143f3f
* Removed Simian.IsSimianEnabled() call, changed the SimianGrid connectors to handle initialization as graceful as possible with the current broken way region module initialization is done
...
* Added config-include/HyperSimianGrid.ini option for connecting to SimianGrid with HyperGrid enabled (work in progress on the SimianGrid side)
2010-09-03 13:36:35 -07:00
Justin Clark-Casey (justincc)
d6deebdd63
Add another variant of password hash construction to SimianAuthenticationServiceConnector.CheckPassword()
...
This might be unique to the inventory archiver password check, though at the time it was written, hash construction there should have been identical to other parts of opensim
This is from patch http://opensimulator.org/mantis/view.php?id=4983 . Thanks cmickeyb.
2010-09-03 21:34:31 +01:00
Justin Clark-Casey (justincc)
8d2e8b7d5c
minor: remove mono compiler warnings
2010-09-03 21:28:57 +01:00
Justin Clark-Casey (justincc)
71c0fc10df
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 21:14:23 +01:00
Micheil Merlin
8daea4d7c0
llRot2Euler Tests
2010-09-03 21:11:13 +01:00
Melanie
5cbc4e2a5f
Merge branch 'master' into careminster-presence-refactor
2010-09-03 19:18:03 +01:00
Diva Canto
0a0f38b23c
Last+2 tweak
2010-09-03 10:31:16 -07:00
Diva Canto
a5cce8d6d7
Last+1 tweak.
2010-09-03 10:13:41 -07:00
Diva Canto
5bbf793f9e
One last tweak, hopefully.
2010-09-03 10:01:18 -07:00
Diva Canto
77384eb28b
Another tweak. Sux^2
2010-09-03 09:26:33 -07:00
Diva Canto
85e9160552
More tweaks related to my previous commit. Tweaks sux.
2010-09-03 09:02:08 -07:00
Melanie
4e0d6e8e41
Merge branch 'master' into careminster-presence-refactor
2010-09-03 03:37:18 +01:00
Melanie
18213d26ec
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-03 03:27:47 +01:00