Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2011-11-23 | 11 | -293/+288 |
|\ | |||||
| * | Log error if we attempt to add/remove an OdeCharacter from the _characters ↵ | Justin Clark-Casey (justincc) | 2011-11-22 | 1 | -23/+33 |
| | | | | | | | | list inappropriately | ||||
| * | Stop removing actor from the hash maps in OdeScene.RemoveCharacter() since ↵ | Justin Clark-Casey (justincc) | 2011-11-22 | 1 | -6/+1 |
| | | | | | | | | this is now being down in OdeCharacter.DestroyOdeStructures() | ||||
| * | Comment out uncalled OdeScene.UnCombine() | Justin Clark-Casey (justincc) | 2011-11-22 | 2 | -66/+60 |
| | | |||||
| * | Comment out unimplemented and uncalled RegionCombinerModule.UnCombineRegion() | Justin Clark-Casey (justincc) | 2011-11-22 | 1 | -27/+27 |
| | | |||||
| * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2011-11-22 | 1 | -1/+1 |
| | | |||||
| * | Stop an exception being thrown and a teleport/border cross failing if the ↵ | Justin Clark-Casey (justincc) | 2011-11-22 | 5 | -32/+41 |
| | | | | | | | | | | | | | | 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) | ||||
| * | slightly simplify OdeScene.Simulate() by removing bool processtaints, since ↵ | Justin Clark-Casey (justincc) | 2011-11-22 | 3 | -141/+128 |
| | | | | | | | | | | | | we can inspect count of taint lists instead. also groups OdeCharacter.CreateOdeStructures() and DestroyOdeStructures() together | ||||
* | | Shell Environment Variables in config | BlueWall | 2011-11-23 | 3 | -3/+30 |
|/ | | | | | | Adding updated Nini and support to use shell environment variables in OpenSimulator configuration. Nini @ https://github.com/BlueWall/Nini-Dev | ||||
* | Improve the error messages returned if the HelloNeighbour call fails. | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -19/+46 |
| | | | | This is the message a region sends to its neighbours when it comes up | ||||
* | Slightly improve "Unable to space collide" logging message, though I don't ↵ | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -1/+2 |
| | | | | think I've ever seen this. | ||||
* | Get rid of OdeCharacter != null checks since OdeScene._characters can never ↵ | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -17/+4 |
| | | | | | | contain a null character. Ignoring the ancient code glyphs not to do this.... | ||||
* | remove unnecessary OdeScene._activeprims locking. Code is single-threaded | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -53/+46 |
| | |||||
* | Restore defects list. In hindsight, the reason for this is becuase we can't ↵ | Justin Clark-Casey (justincc) | 2011-11-21 | 2 | -92/+112 |
| | | | | | | remove the character whilst iterating over the list. This commit also removes locking on OdeScene._characters since code is single threaded | ||||
* | simplify operation of OdeScene._perloopContact | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -45/+51 |
| | |||||
* | don't bother locking OdeScene._perloopContact in single threaded code | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -47/+42 |
| | |||||
* | don't lock OdeScene.contacts since only ever accessed by a single thread | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -10/+24 |
| | |||||
* | rename ODECharacter.AvatarGeomAndBodyCreation() -> CreateOdeStructures() to ↵ | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -8/+10 |
| | | | | match existing DestroyOdeStructures() | ||||
* | refactor: Eliminate one line ODECharacter.doForce() method for code clarity | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -15/+3 |
| | |||||
* | Comment out calls to OdeScene.waitForSpaceUnlock() since that method does ↵ | Justin Clark-Casey (justincc) | 2011-11-21 | 3 | -23/+24 |
| | | | | nothing right now | ||||
* | Reduce complexity of OdeScene.Simulate() by fully removing bad characters at ↵ | Justin Clark-Casey (justincc) | 2011-11-21 | 2 | -70/+29 |
| | | | | point of detection rather than later on. | ||||
* | move geom/actor map maintenance into ↵ | Justin Clark-Casey (justincc) | 2011-11-21 | 2 | -10/+9 |
| | | | | | | DestroyODEStructures()/AvatarGeomAndBodyCreation(). This saves us having to do it separately when a character capsule size is changed | ||||
* | When changing avatar size in ODE, remove the old actor from the name and ↵ | Justin Clark-Casey (justincc) | 2011-11-21 | 2 | -8/+14 |
| | | | | actor maps | ||||
* | When an ODECharacter is removed (e.g. when an avatar leaves a scene), remove ↵ | Justin Clark-Casey (justincc) | 2011-11-21 | 2 | -10/+23 |
| | | | | | | the actor reference in OdeScene.actor_name_map rather than leaving it dangling. This also largely centralizes adds/removes in OdeScene.AddCharacter()/RemoveCharacter() | ||||
* | Have ODECharacter and ODEPrim both use PhysicsActor.Name instead of ↵ | Justin Clark-Casey (justincc) | 2011-11-21 | 3 | -9/+14 |
| | | | | maintaining their own properties | ||||
* | Actually remove PhysicsActor.SOPDescription this time | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -1/+3 |
| | |||||
* | Chain SOP constructors together rather than having copy/paste code | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -14/+5 |
| | |||||
* | refactor: Make SOP.Description an automatic property | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -6/+3 |
| | |||||
* | Remove unused PhysicsActor.SOPDescription | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -11/+2 |
| | |||||
* | Instead of generating a new list for bad characters on every physics pass, ↵ | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -3/+12 |
| | | | | keep reusing the same list. | ||||
* | Remove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for ↵ | Justin Clark-Casey (justincc) | 2011-11-19 | 2 | -3/+2 |
| | | | | | | | 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. | ||||
* | minor: Make HelloNeighbour messages more informative | Justin Clark-Casey (justincc) | 2011-11-19 | 1 | -5/+10 |
| | |||||
* | Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent ↵ | Justin Clark-Casey (justincc) | 2011-11-19 | 6 | -10/+13 |
| | | | | | | | 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 | ||||
* | Remove mono compiler warnings. Fix problem with co-ordinate given in ↵ | Justin Clark-Casey (justincc) | 2011-11-19 | 3 | -9/+9 |
| | | | | deregister region message | ||||
* | Improve some grid region log messages to express regions at co-ordinate ↵ | Justin Clark-Casey (justincc) | 2011-11-19 | 5 | -13/+50 |
| | | | | (e.g. 1000, 1000) rather than meter positions (256000, 256000) | ||||
* | improve region deregistration log message | Justin Clark-Casey (justincc) | 2011-11-19 | 1 | -1/+4 |
| | |||||
* | Don't register a region twice on both official registration and maptile ↵ | Justin Clark-Casey (justincc) | 2011-11-19 | 4 | -8/+11 |
| | | | | | | regeneration. Maptile storage appears orthogonal to region registration | ||||
* | For TerrainModule.SaveToFile(), don't bother throwing the exception onwards ↵ | Justin Clark-Casey (justincc) | 2011-11-17 | 1 | -1/+0 |
| | | | | | | after printing out the error, since this method is invoked by users. Still throwing the exception on the stream method since this invoked programatically | ||||
* | Make "terrain save" more friendly by telling the user if we have saved and ↵ | Justin Clark-Casey (justincc) | 2011-11-17 | 1 | -18/+32 |
| | | | | putting out a useful complaint message if we haven't for some reason | ||||
* | If the entire simulator is shutting down then don't bother to unload the ↵ | Justin Clark-Casey (justincc) | 2011-11-17 | 2 | -17/+35 |
| | | | | | | | scripts from the appdomain in XEngine. All the other actions (script state save, etc.) still occur. This makes shutdown where there are many scripts vastly quicker. | ||||
* | Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their ↵ | Justin Clark-Casey (justincc) | 2011-11-16 | 9 | -44/+40 |
| | | | | | | | own private m_localID property but leaving get to return the then unset PhysicsActor.LocalId! Instead, just have both subclasses use the PhysicsActor.LocalID property. This restores collision functionality that fell away in 45c7789 yesterday | ||||
* | Call public ForEach instead of using m_entities directly. No semantic ↵ | Dan Lake | 2011-11-16 | 1 | -2/+2 |
| | | | | changes, just cleanup | ||||
* | In AddNewClient, iterator over copy of entities rather than copying under ↵ | Dan Lake | 2011-11-15 | 1 | -2/+3 |
| | | | | read lock | ||||
* | Comment out the vebose logging on HGFriendsModule. | Justin Clark-Casey (justincc) | 2011-11-16 | 1 | -12/+11 |
| | | | | Recent issues in http://opensimulator.org/mantis/view.php?id=5794 were not related to HG friends | ||||
* | Fix the build break | Justin Clark-Casey (justincc) | 2011-11-16 | 1 | -1/+1 |
| | |||||
* | Look up a homeURL only when it's not null, in addition to not being string.Empty | Justin Clark-Casey (justincc) | 2011-11-16 | 1 | -1/+1 |
| | |||||
* | Enable log message to tell us what type of url is being requested from a ↵ | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -3/+3 |
| | | | | user's homeurl | ||||
* | Make tracked per scene thread names conform to the majorirty format. | Justin Clark-Casey (justincc) | 2011-11-15 | 2 | -4/+9 |
| | | | | This is <thread-name> (<region-name>) | ||||
* | fix build break on UserManagementModule. | Justin Clark-Casey (justincc) | 2011-11-15 | 3 | -15/+23 |
| | | | | This also adds time since started to "show threads". Unfortunately these two changes got mixed in. | ||||
* | Do proper locking of UserManagementModule.m_UserCache when getting. | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -29/+57 |
| | | | | | | | | This might help with [USER AGENT CONNECTOR]: new connector to () [USER AGENT CONNECTOR]: Unable to contact remote server for GetServerURLs [USER AGENT CONNECTOR]: Malformed Uri : Argument cannot be null. Parameter name: uriString |