85824d2cd9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-25 20:12:59 +01:00
f7378829c3
Fix the root cause of keyframe motion region crossing offset - UpdateSceneObject
...
was being called twice on each crossing.
2013-08-25 06:26:56 +02:00
e0399ccaec
* This fixes the border crossing offsets by storing the final keyframe location in the hijacked variable KeyFrame.AngularVelocity. When steps in OnTimer <= 0.0, normalize the final position by Constants.RegionSize and move the object there. The hack here is KeyFrame.AngularVelocity probably isn't the right name for this variable because it's the un-mucked with keyframe position. When you determine the feasibility of changing the name without affecting the serialization of existing objects in world... It's simply a name change to KeyFrame.FinalPosition or something proper.
2013-08-24 18:55:21 -05:00
ec32c1d4b6
Added some more debug messages.
2013-08-24 09:59:05 -07:00
f0c0376660
Potential fix for access control bug on login introduced with SeeIntoRegion commit.
2013-08-24 08:42:41 -07:00
01c3be2746
* Fix a null ref that causes a stack unwind when crossing borders. Less stack unwinding.. the faster it goes.
...
* Tweak XEngine so that it's partially functional again. It's still not great, but basic things work.
2013-08-24 05:55:53 -05:00
58359788a9
Revert "* This increases accuracy when border crossing (the reason is.. the border crossing code will use velocity to predict where the object should be, so setting it to zero. It still looses about 0.0045 per loop."
...
This reverts commit 55400ff7be
2013-08-24 05:54:08 -05:00
5cd7bc2848
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-24 03:42:39 -07:00
c7a8afbb8d
Make HG logins fall back to fallback regions if the desired region fails.
2013-08-24 03:41:56 -07:00
6a24515269
Whitespace fubar.
2013-08-24 03:40:44 -07:00
c34e6f25b1
Fix a printing of exception error in InventoryArchiveModule that only
...
printed the error message and not the call stack.
2013-08-23 13:53:47 -07:00
1a623bb266
Rename pCampbot.ini -> pCampBot.ini (and example file) to be consistent with other capitalizations of pCampBot
2013-08-23 20:58:46 +01:00
55400ff7be
* This increases accuracy when border crossing (the reason is.. the border crossing code will use velocity to predict where the object should be, so setting it to zero. It still looses about 0.0045 per loop.
2013-08-23 00:28:36 -05:00
0fbfef9649
minor: shortern warning messages in EntityTransferModule when UpdateAgent() fails
2013-08-23 01:21:03 +01:00
050617ae0e
Make pCampbot "show bot" command take the bot number instead of the full bot name
...
Shorter and can do this because bot names are uniform
2013-08-23 01:13:19 +01:00
04f4dd3dc7
remove redundant return at end of HandleDeregisterRegion()
2013-08-23 01:04:03 +01:00
2be786709b
Make it possible for the "deregister region id" command to accept more than one id
2013-08-23 01:03:27 +01:00
61c20bd06a
Remove old and unused ScenePresence.RestoreInCurrentScene()
2013-08-23 00:53:42 +01:00
065c5839b5
Refactor: merge SceneGraph.AddScenePresence() into CreateAndAddChildScenePresence() since the former was only ever called from the latter
...
This allows us to remove dead code relating to adding root agents directly to the scenegraph, which never happens.
2013-08-23 00:49:13 +01:00
a9f9b0da9d
minor: Correct typo on "debug stats record start" message
2013-08-23 00:13:31 +01:00
a0c99a7dcc
minor: remove mono compiler warning from LLClientView
2013-08-23 00:03:47 +01:00
13556cf129
Fix a further bug in pCampbot connect where ignoring already connected bots was wrongly counted as a connect
...
Also, only sleep when we actually perform a connection
2013-08-22 23:49:19 +01:00
70f89ae65b
Make it possible to adjust the pCampbot login delay via the [BotManager] LoginDelay parameter of pCampbot.ini
2013-08-22 23:43:33 +01:00
51c7fb1969
Add "set bots" command to make it possible to set SEND_AGENT_UPDATES on all bots whilst pCampbot is running
2013-08-22 23:11:05 +01:00
beb9d966f9
Stop "handle sit user name" command from trying to sit avatars on objects which have sit positions but are attachments
2013-08-22 22:49:23 +01:00
416bbe9583
Stop error messages being misleadingly generated when on client connection activity timeout, a root connection triggers a CloseAgent to a neighbour region which has already closed the agent due to inactivity.
...
Also separates out log messages to distinguish between close not finding an agent and wrong auth token, and downgrades former to debug and latter to warn
2013-08-22 22:46:40 +01:00
66a7dc3a0d
In pCampbot, don't try and reconnect bots that are already connected on console "connect" command
2013-08-22 20:12:14 +01:00
832c35d4d5
Stop "sit user name" and "stand user name" console commands from trying to sit/stand avatars already sitting/standing
2013-08-22 20:05:57 +01:00
689cf2d367
minor: Make logging in GatekeeperService.LoginAgent() a bit more detailed so that we can distinguish between simultaneous logins
2013-08-22 01:24:55 +01:00
bcb8605f84
Revert "Implement ability for hg logins to try fallback regions just like local logins."
...
This approach does not work - it is taking place too far down the login process where really the region checking
could only be done when the hg map tiles are linked on the main map (messy and probably impossible) or possibly
when the final destination is fetched at the very first stage of teleport (which couldn't be done without a protocol
change to pass the agentID as well as the requested regionID)
This reverts commit 3d9b73c47a
2013-08-22 01:20:01 +01:00
3d9b73c47a
Implement ability for hg logins to try fallback regions just like local logins.
...
These would be specified in the [GridService] section of Robust.HG.ini, which already lists these in the example text.
Untested patch so that Neb can easily pull in for testing, though shouldn't disrupt existing hg logins since fallback processing is a bit of code stuck on the end of the login sequence.
2013-08-21 23:19:31 +01:00
1f39a763a5
Don't allow users to attempt to sit on objects in a child region without going to that region first.
...
If this is attempted, they get a "Try moving closer. Can't sit on object because it is not in the same region as you." message instead, which is the same as current ll grid.
Sitting on ground is okay, since viewer navigates avatar to required region first before sitting.
2013-08-21 21:35:03 +01:00
a6af561660
* Fix some threading issues in BulletXNA (the managed bullet library), this should better allow you to run it in multiple region scenarios (but why would you really want to do that?) Source in OpenSimLibs.
...
* Fixed a null ref during shutdown.
2013-08-20 21:09:17 -05:00
4a81465b91
Fix build break from last commit a3e1b27 on mono 2.4.3
...
Looks like this level of mono doesn't have a string.Join() which will take a list rather than an array (or some implicit conversion isn't happening)
2013-08-20 18:47:52 +01:00
a3e1b278a1
Add pCampbot "show bot" console command to show more detailed information on a particular bot (e.g. what sims they are connected to)
2013-08-20 18:41:09 +01:00
43940f6562
Add --regex options to "sit user name" and "stand user name" console commands to sit/stand many avatars at once.
...
Currently, first name and last name are input separate but are concatenated with a space in the middle to form a regex.
So to sit all bots with the first name "ima", for instance, the command is "sit user name --regex ima .*"
2013-08-20 18:13:40 +01:00
e384ff604e
Add experimental "sit user name" and "stand user name" console commands in SitStandCommandsModule.
...
"sit user name" will currently only sit the given avatar on prims which have a sit target set and are not already sat upon.
Chiefly for debug purposes.
2013-08-20 17:43:02 +01:00
56d1d67a34
Add pCampbot console commands to sit all bots on ground and stand all bots
2013-08-20 17:01:12 +01:00
a3dd7db4a3
Add -connect (-c) switch to pCampbot command line options.
...
Now, bots will only connect at startup if this switch is specified.
If it is not specified, then a separate "connect" command is required on the pCampbot command line
2013-08-20 00:08:47 +01:00
589b1a2eaf
Make it possible to reconnect pCampbots with the console command "connect [<n>]".
...
If no n is given then all available bots are connected
2013-08-19 23:50:18 +01:00
ea3f024b8a
refactor: start bot connection thread within BotManager rather than externally
2013-08-19 21:25:17 +01:00
079cd4e94f
refactor: restructure pCampbot multi-bot connection code.
2013-08-19 21:17:59 +01:00
2fa42f24fd
Make it possible to disconnected a specified number of bots via the pCampbot console command "disconnect [<n>]"
...
Bots disconnected are ascending from last in numeric order.
Temporarily no way to reconnect bots.
2013-08-19 21:00:31 +01:00
49b7cbda72
Create a separate pCampbot "disconnect" console command which disconnects connected bots.
...
"quit" console command now requires bots to be separate disconnected first before quitting.
This is to prepare the way for disconnecting/reconnecting different numbers of bots in a pCampbot session.
And hopefully resolves bug where console appears not to be reset if Environment.Exit(0) is called on a different thread
2013-08-19 20:29:17 +01:00
ef63abe9b1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-19 20:00:42 +01:00
a90a5f52dd
Show number of connections each bot has established in "show bots" command.
2013-08-19 19:38:20 +01:00
aa7f4215a9
Merge branch 'master' into careminster
2013-08-18 03:00:32 +01:00
3585b0a139
Allow updating the wearable type of wearables that have a type of 0.
...
This will allow viewers to fix broken wearables as they detect them.
2013-08-18 02:59:10 +01:00
bef03fb30b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
2013-08-17 03:23:45 +01:00
85a9cb260a
Remove mono compiler warnings from UserProfilesModule
2013-08-17 01:10:58 +01:00
Justin Clark-Casey (justincc)