John Hurliman
1430441cf3
Change the SimianGrid connector log messages to start with "[SIMIAN " to avoid configuration confusion
2010-03-26 15:13:55 -07:00
John Hurliman
493d02d2e6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-26 13:50:45 -07:00
John Hurliman
d6a64bf732
* Catch exceptions thrown when MySQLEstateData.LinkRegion() is called. This won't fix the bug I'm seeing with regions not realizing they are already part of an estate, but it will fix the OpenSim crash if that situation ever comes up
2010-03-26 13:50:25 -07:00
Justin Clark-Casey (justincc)
fd53deb6fc
add nant distbin target
...
this will delete all extraneous source code files and copy OpenSim.ini.example to OpenSim.ini
2010-03-26 20:49:07 +00:00
Justin Clark-Casey (justincc)
18ed68cd31
add nant distbin target
...
this will delete all extraneous source code files and copy OpenSim.ini.example to OpenSim.ini
2010-03-26 20:47:26 +00:00
Diva Canto
c6bbb48f2b
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-03-26 13:14:32 -07:00
Diva Canto
f55dd3704d
Hippos with bin/Newtonsoft.Json.XML
2010-03-26 13:14:13 -07:00
Diva Canto
8ee0bdb86e
Minor improvement on debug message.
2010-03-26 13:13:33 -07:00
unknown
9fb17e7ab2
Select Random Region if Home or Last cant be found
2010-03-26 13:06:26 -07:00
Justin Clark-Casey (justincc)
24ca202dab
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-03-26 19:57:11 +00:00
Justin Clark-Casey (justincc)
bcac984f5d
fix nant related build break
2010-03-26 19:56:53 +00:00
John Hurliman
a6e14165fd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-26 12:39:36 -07:00
John Hurliman
05123c6bd5
* Fixed a dictionary value retrieval in GroupsModule
2010-03-26 12:39:22 -07:00
Justin Clark-Casey (justincc)
4d712ddaae
comment out very probably unused dist and distdir nant targets
2010-03-26 19:36:21 +00:00
Justin Clark-Casey (justincc)
fc2b137581
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-03-26 19:34:49 +00:00
Justin Clark-Casey (justincc)
9d747cb53b
comment out very probably unused dist and distdir nant targets
2010-03-26 19:33:19 +00:00
John Hurliman
3e8cb7a9a0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-26 12:21:24 -07:00
John Hurliman
5a2315c68c
* Fixed a bug with null value handling in WebUtil.BuildQueryString()
...
* Changed the null check back in estate manager setup but fixed the case for an existing account being found
* Implemented SetPassword() in the SimianGrid auth connector
2010-03-26 12:21:05 -07:00
Justin Clark-Casey (justincc)
dd544f811a
switch flavor to RC1
2010-03-26 19:09:09 +00:00
Justin Clark-Casey (justincc)
4565e5dfbc
change trunk version to 0.7.Dev
2010-03-26 18:56:05 +00:00
John Hurliman
dd1c1b3bcd
Fixed a backwards null check that was preventing estate owner from being set and a misleading error message (in grid mode it tries to get a user, not create one)
2010-03-26 11:08:14 -07:00
Justin Clark-Casey (justincc)
87fe96ae2c
replace recent IModule.GetGroup() with better GetGroupRecord(string name)
2010-03-26 00:10:29 +00:00
Justin Clark-Casey (justincc)
857918d3b0
minor: some debugging information and spacing changes to group module
2010-03-25 23:53:05 +00:00
Justin Clark-Casey (justincc)
f0703cad2c
add get group by name method to IGroupsModule
2010-03-25 22:47:52 +00:00
Justin Clark-Casey (justincc)
19c659ca99
fix unit tests broken by commit dcf18689b9
...
can't prompt for estate owner in unit tests
2010-03-25 21:46:23 +00:00
Justin Clark-Casey (justincc)
bfbf25c542
minor: Print out port that http servers are using
...
do this in callers so that we know who is setting up these things
2010-03-25 21:36:57 +00:00
Justin Clark-Casey (justincc)
6ad85dc259
put out full exception stack if something reaches top of base http server OnRequest() on both mono and .net
...
replace Newtonsoft.Json.XML since the updated copy got accidentally reverted by another commit
2010-03-25 20:33:46 +00:00
Melanie Thielker
e0b287961f
Change land overlay to send group owned status properly
2010-03-23 17:04:37 +01:00
Melanie
3fb73e4e26
UNTESTED SQLite code to enable estate setup in interactive confguration
2010-03-23 02:18:55 +00:00
Melanie
dcf18689b9
First stage of the new interactive region creation. This will allow creation
...
of a region and joining it to an existing estate or creating a new estate,
as well as creating an estate owner if in standalone, and assigning estate
owners. In Grid mode, existing users must be used. MySQL ONLY!!!! so far, as
I can't develop or test for either SQLite or MSSQL.
2010-03-23 02:05:56 +00:00
Melanie
07a6b37001
Somehow the starting estate number in MySQL was lost. This adds a migration
...
to start estates at 100. Existing databases having autcreated estates below
100 will see a gap in estate numbering. Other database implementors need to
ensure that no estates with numbers less that 100 are autocreated, unless
they are prepared to deal with the viewer's built-in notions of
Linden Mainland
2010-03-22 20:38:27 +00:00
Melanie
d378c758e1
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-03-22 18:51:07 +00:00
Melanie
70b0e07d1e
Remove the reading of estate_settings.xml and the associated processing of
...
defaults. Adding code to facilitate estate creation / managemment as part of
first time start up
2010-03-22 18:49:56 +00:00
John Hurliman
9a781e793a
* Updated libomv libraries to fix JSON (LLSD) decoding errors on null values and remove the unused OpenMetaverse.Http.dll and Mono.Security.dll
...
* Fixed a password hash comparison error in SimianAuthenticationServiceConnector.Authenticate()
2010-03-20 19:21:58 -07:00
Melanie
f020bd3206
Fix a nullref in permissions when returning objects via right-click
2010-03-20 15:49:39 +00:00
Kitto Flora
0f5fb6f190
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-03-19 19:14:09 -04:00
Kitto Flora
add47befac
Update acceleration to 0 on no tphysical.
2010-03-19 18:53:16 -04:00
John Hurliman
5e65bef805
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-19 15:17:15 -07:00
Dan Lake
62e0b53ca4
Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files.
2010-03-19 15:16:44 -07:00
Dan Lake
859bc717a4
Cleaned up access to scenepresences in scenegraph. GetScenePresences and GetAvatars have been removed to consolidate locking and iteration within SceneGraph. All callers which used these to then iterate over presences have been refactored to instead pass their delegates to Scene.ForEachScenePresence(Action<ScenePresence>).
2010-03-19 15:16:35 -07:00
Kitto Flora
0e36994fe7
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-03-19 13:27:12 -04:00
Kitto Flora
3ea72eeabb
Fix sit with autopilot.
2010-03-19 13:26:34 -04:00
Melanie
4c2a51b1b5
Merge branch 'master' into careminster-presence-refactor
2010-03-18 20:09:04 +00:00
Melanie
46d990419b
Merge branch 'careminster' into careminster-presence-refactor
2010-03-18 20:00:58 +00:00
Melanie
e0289bb432
Flesh out the new permission method
2010-03-18 19:58:21 +00:00
Melanie
69b5ddceda
Unify a previous refactor of object return with the older solution. We
...
really don't need two methods doing the same thing, but differently.
2010-03-18 18:58:56 +00:00
Melanie
1a2cbbc8c1
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-03-18 18:58:44 +00:00
Melanie
f35eb8819c
Unify a previous refactor of object return with the older solution. We
...
really don't need two methods doing the same thing, but differently.
2010-03-18 18:58:37 +00:00
Melanie
734b0416de
Unify a previous refactor of object return with the older solution. We
...
really don't need two methods doing the same thing, but differently.
2010-03-18 18:57:29 +00:00
Dan Lake
73e9b0be72
Inconsistent locking of ScenePresence array in SceneGraph. Fixed by eliminating option to return the actual list. Callers can now either request a copy of the array as a new List or ask the SceneGraph to call a delegate function on every ScenePresence. Iteration and locking of the ScenePresences now takes place only within the SceneGraph class.
...
This patch also applies a fix to Combat/CombatModule.cs which had unlocked iteration of the ScenePresences and inconsistent try/catch around the use of those ScenePresences.
2010-03-17 11:21:27 -07:00