0a60e9537f
comment out a noisy log line I accidentally left in from the last commit
2011-11-24 21:30:40 +00:00
63c137820b
Stop passing a request handler to the initial caps.RegisterHandler in EventQueueGetModule since this is immediatley replaced by a poll server handler.
...
This allows us to comment out a bunch of code and simplify the codebase and readability.
2011-11-24 21:27:35 +00:00
0174e326e3
Add a "debug eq" console command for debugging.
...
This will log outgoing event queue message names if turned on.
2011-11-24 20:27:11 +00:00
decabe1181
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-24 20:22:17 +00:00
bdcfd6afee
Add disabled CrossBehaviour to pCampBot, which is designed to cross test bots between neighbouring regions.
...
Not yet enabled since there is a bug where the initial cross will work but all subsequent movements on the receiving simulator appear to fail.
2011-11-24 17:35:33 +00:00
a8270cb48c
Merge branch 'master' into bigmerge
2011-11-24 01:16:37 +00:00
89b2fb2ff4
Append asset ID to URL for storage requests to allow caching proxies to work with Simian
2011-11-23 16:41:30 -08:00
5485e3da46
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-11-23 16:11:17 -08:00
0cb33a5398
Line endings
2011-11-23 16:09:11 -08:00
11dfd7711b
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-11-24 00:54:52 +01:00
ed7ddeecf2
Print out what behaviours are active when pCampBot starts up
2011-11-23 22:18:10 +00:00
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
1126efdcd0
In pCampbot, change "show status" command to "show bots"
2011-11-23 21:33:54 +00:00
9ae0641871
Rename Bot.BotManager to Manager
2011-11-23 21:33:10 +00:00
e9f2a9bddb
get pCampBot to extract nearby and store nearby region information
2011-11-23 21:19:10 +00:00
617f139aac
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-23 21:10:50 +00:00
e394f83df0
Change random number generator property name in pCampbot
2011-11-23 18:00:41 +00:00
0738fc43e4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-23 10:50:29 -05:00
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
b56410285b
Log error if we attempt to add/remove an OdeCharacter from the _characters list inappropriately
2011-11-22 22:46:25 +00:00
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
af90b52731
Comment out uncalled OdeScene.UnCombine()
2011-11-22 22:28:46 +00:00
fcb066cb5f
Comment out unimplemented and uncalled RegionCombinerModule.UnCombineRegion()
2011-11-22 22:23:52 +00:00
d639f7fdf3
minor: remove mono compiler warning
2011-11-22 22:16:09 +00:00
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
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
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
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
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
82dc7886fc
remove unnecessary OdeScene._activeprims locking. Code is single-threaded
2011-11-21 21:15:15 +00:00
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
546259b2ff
simplify operation of OdeScene._perloopContact
2011-11-21 20:30:37 +00:00
25d9001de1
don't bother locking OdeScene._perloopContact in single threaded code
2011-11-21 20:17:36 +00:00
e33b0fa35b
don't lock OdeScene.contacts since only ever accessed by a single thread
2011-11-21 20:12:04 +00:00
e67ba0ad06
rename ODECharacter.AvatarGeomAndBodyCreation() -> CreateOdeStructures() to match existing DestroyOdeStructures()
2011-11-21 20:01:34 +00:00
063f0f5d97
refactor: Eliminate one line ODECharacter.doForce() method for code clarity
2011-11-21 19:58:37 +00:00
225b925f4e
Comment out calls to OdeScene.waitForSpaceUnlock() since that method does nothing right now
2011-11-21 19:48:31 +00:00
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
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
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
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
cead87005b
Have ODECharacter and ODEPrim both use PhysicsActor.Name instead of maintaining their own properties
2011-11-21 18:06:04 +00:00
4fdcfd79e4
Actually remove PhysicsActor.SOPDescription this time
2011-11-21 17:55:54 +00:00
39c1ae2408
Chain SOP constructors together rather than having copy/paste code
2011-11-21 17:55:10 +00:00
58a1147870
refactor: Make SOP.Description an automatic property
2011-11-21 17:51:38 +00:00
e0887944a0
Remove unused PhysicsActor.SOPDescription
2011-11-21 17:47:30 +00:00
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
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
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
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)