Justin Clark-Casey (justincc)
ed7ddeecf2
Print out what behaviours are active when pCampBot starts up
2011-11-23 22:18:10 +00:00
Justin Clark-Casey (justincc)
d145750e87
Add teleport behaviour to pCampBot
...
This teleports the bot to any other regions +/- 5 on the x or y axis.
Quite aggressive at the moment since teleports keep occuring at a 1-10secs random interval.
No checking yet to see if teleport was successful.
2011-11-23 22:05:11 +00:00
Justin Clark-Casey (justincc)
1126efdcd0
In pCampbot, change "show status" command to "show bots"
2011-11-23 21:33:54 +00:00
Justin Clark-Casey (justincc)
9ae0641871
Rename Bot.BotManager to Manager
2011-11-23 21:33:10 +00:00
Justin Clark-Casey (justincc)
e9f2a9bddb
get pCampBot to extract nearby and store nearby region information
2011-11-23 21:19:10 +00:00
Justin Clark-Casey (justincc)
617f139aac
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-23 21:10:50 +00:00
Justin Clark-Casey (justincc)
e394f83df0
Change random number generator property name in pCampbot
2011-11-23 18:00:41 +00:00
BlueWall
0738fc43e4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-23 10:50:29 -05:00
BlueWall
d4e3a7fe81
Shell Environment Variables in config
...
Adding updated Nini and support to use shell environment variables in OpenSimulator configuration.
Nini @ https://github.com/BlueWall/Nini-Dev
2011-11-23 10:11:47 -05:00
Justin Clark-Casey (justincc)
b56410285b
Log error if we attempt to add/remove an OdeCharacter from the _characters list inappropriately
2011-11-22 22:46:25 +00:00
Justin Clark-Casey (justincc)
ace4324e75
Stop removing actor from the hash maps in OdeScene.RemoveCharacter() since this is now being down in OdeCharacter.DestroyOdeStructures()
2011-11-22 22:37:06 +00:00
Justin Clark-Casey (justincc)
af90b52731
Comment out uncalled OdeScene.UnCombine()
2011-11-22 22:28:46 +00:00
Justin Clark-Casey (justincc)
fcb066cb5f
Comment out unimplemented and uncalled RegionCombinerModule.UnCombineRegion()
2011-11-22 22:23:52 +00:00
Justin Clark-Casey (justincc)
d639f7fdf3
minor: remove mono compiler warning
2011-11-22 22:16:09 +00:00
Justin Clark-Casey (justincc)
b0fe0464af
Stop an exception being thrown and a teleport/border cross failing if the desintation sim has no active script engines.
...
This involves getting IScene.RequestModuleInterfaces() to return an empty array (as was stated in the method doc) rather than an array containing one null entry.
Callers adjusted to stop checking for the list reference being null (which never happened anyway)
2011-11-22 22:13:57 +00:00
Justin Clark-Casey (justincc)
daf99f8c0a
slightly simplify OdeScene.Simulate() by removing bool processtaints, since we can inspect count of taint lists instead.
...
also groups OdeCharacter.CreateOdeStructures() and DestroyOdeStructures() together
2011-11-22 21:51:00 +00:00
Justin Clark-Casey (justincc)
b89c48b1be
Improve the error messages returned if the HelloNeighbour call fails.
...
This is the message a region sends to its neighbours when it comes up
2011-11-21 22:06:43 +00:00
Justin Clark-Casey (justincc)
c4e4a29478
Slightly improve "Unable to space collide" logging message, though I don't think I've ever seen this.
2011-11-21 21:31:26 +00:00
Justin Clark-Casey (justincc)
4ddff7eb0f
Get rid of OdeCharacter != null checks since OdeScene._characters can never contain a null character.
...
Ignoring the ancient code glyphs not to do this....
2011-11-21 21:29:56 +00:00
Justin Clark-Casey (justincc)
82dc7886fc
remove unnecessary OdeScene._activeprims locking. Code is single-threaded
2011-11-21 21:15:15 +00:00
Justin Clark-Casey (justincc)
7480f2fd0e
Restore defects list. In hindsight, the reason for this is becuase we can't remove the character whilst iterating over the list.
...
This commit also removes locking on OdeScene._characters since code is single threaded
2011-11-21 21:04:24 +00:00
Justin Clark-Casey (justincc)
546259b2ff
simplify operation of OdeScene._perloopContact
2011-11-21 20:30:37 +00:00
Justin Clark-Casey (justincc)
25d9001de1
don't bother locking OdeScene._perloopContact in single threaded code
2011-11-21 20:17:36 +00:00
Justin Clark-Casey (justincc)
e33b0fa35b
don't lock OdeScene.contacts since only ever accessed by a single thread
2011-11-21 20:12:04 +00:00
Justin Clark-Casey (justincc)
e67ba0ad06
rename ODECharacter.AvatarGeomAndBodyCreation() -> CreateOdeStructures() to match existing DestroyOdeStructures()
2011-11-21 20:01:34 +00:00
Justin Clark-Casey (justincc)
063f0f5d97
refactor: Eliminate one line ODECharacter.doForce() method for code clarity
2011-11-21 19:58:37 +00:00
Justin Clark-Casey (justincc)
225b925f4e
Comment out calls to OdeScene.waitForSpaceUnlock() since that method does nothing right now
2011-11-21 19:48:31 +00:00
Justin Clark-Casey (justincc)
54789706f4
Reduce complexity of OdeScene.Simulate() by fully removing bad characters at point of detection rather than later on.
2011-11-21 19:45:22 +00:00
Justin Clark-Casey (justincc)
3becda919e
move geom/actor map maintenance into DestroyODEStructures()/AvatarGeomAndBodyCreation().
...
This saves us having to do it separately when a character capsule size is changed
2011-11-21 19:31:29 +00:00
Justin Clark-Casey (justincc)
4faac1f090
When changing avatar size in ODE, remove the old actor from the name and actor maps
2011-11-21 19:06:53 +00:00
Justin Clark-Casey (justincc)
898904d83d
When an ODECharacter is removed (e.g. when an avatar leaves a scene), remove the actor reference in OdeScene.actor_name_map rather than leaving it dangling.
...
This also largely centralizes adds/removes in OdeScene.AddCharacter()/RemoveCharacter()
2011-11-21 18:27:41 +00:00
Justin Clark-Casey (justincc)
cead87005b
Have ODECharacter and ODEPrim both use PhysicsActor.Name instead of maintaining their own properties
2011-11-21 18:06:04 +00:00
Justin Clark-Casey (justincc)
4fdcfd79e4
Actually remove PhysicsActor.SOPDescription this time
2011-11-21 17:55:54 +00:00
Justin Clark-Casey (justincc)
39c1ae2408
Chain SOP constructors together rather than having copy/paste code
2011-11-21 17:55:10 +00:00
Justin Clark-Casey (justincc)
58a1147870
refactor: Make SOP.Description an automatic property
2011-11-21 17:51:38 +00:00
Justin Clark-Casey (justincc)
e0887944a0
Remove unused PhysicsActor.SOPDescription
2011-11-21 17:47:30 +00:00
Justin Clark-Casey (justincc)
4485007fce
Instead of generating a new list for bad characters on every physics pass, keep reusing the same list.
2011-11-21 17:04:54 +00:00
Justin Clark-Casey (justincc)
a94ce3f1df
Move DeleteScriptsOnStartup switch from [Startup] to [XEngine] in OpenSim.ini.example.
...
If anybody was changing this and wondering why there was no effect, this is why.
2011-11-21 15:30:00 +00:00
Melanie
bdb5ac96d9
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-11-19 22:39:15 +00:00
Melanie
dec8b9c98d
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-11-19 22:26:41 +01:00
Justin Clark-Casey (justincc)
2206e2fc96
Remove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for SendCreateChildAgent" message
...
This is misleading since a simulator will call this method before successfully trying remote regions.
Also comments out spammy "[SIMULATION]: Stream handler called" AgentHandlers messages for now.
2011-11-19 01:32:21 +00:00
Justin Clark-Casey (justincc)
726ca72c47
minor: Make HelloNeighbour messages more informative
2011-11-19 01:27:06 +00:00
Justin Clark-Casey (justincc)
10a23a823e
Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages
...
These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them.
Also finally get the deregister grid service message working properly
2011-11-19 01:16:07 +00:00
Justin Clark-Casey (justincc)
21353de9b7
Enable v2/v3 map tile url setting on robust as default in config
...
This is necessary to see map tiles on v2/v3 viewers and appears to work fine
2011-11-19 00:34:56 +00:00
Justin Clark-Casey (justincc)
b89534ad0a
Remove mono compiler warnings. Fix problem with co-ordinate given in deregister region message
2011-11-19 00:34:13 +00:00
Justin Clark-Casey (justincc)
d05d065d85
Improve some grid region log messages to express regions at co-ordinate (e.g. 1000, 1000) rather than meter positions (256000, 256000)
2011-11-19 00:29:52 +00:00
Justin Clark-Casey (justincc)
7a18078177
improve region deregistration log message
2011-11-19 00:10:29 +00:00
Justin Clark-Casey (justincc)
01ae916bad
Don't register a region twice on both official registration and maptile regeneration.
...
Maptile storage appears orthogonal to region registration
2011-11-19 00:07:34 +00:00
justincc
f72c4bdba5
Replace HttpServer_OpenSim.dll with Oren Hurvitz's patch applied.
...
This will hopefully address mantis 5471, 5694 and 5718.
This code is now in opensim-libs, along with Diva's slightly older patches (which were already applied to the DLLs in the opensim tree).
Thanks Oren!
2011-11-18 22:52:59 +00:00
Justin Clark-Casey (justincc)
9d458fdd7f
Turn the [RegionReady] module on by default and login_disable = true while scripts are loading.
...
From field experience, we know that simulators can be unstable if a user logs in before the scripts have finished loading.
This commit turns login_disable = true in [RegionReady] on by default which prevents this from happening.
If you want the old behaviour, please copy these section from OpenSimDefaults.ini into OpenSim.ini and set login_disable = false
2011-11-18 21:31:23 +00:00