| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | | | 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 | |||||
| | | * | | | | | 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. | |||||
| | | * | | | | | Move DeleteScriptsOnStartup switch from [Startup] to [XEngine] in ↵ | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -7/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenSim.ini.example. If anybody was changing this and wondering why there was no effect, this is why. | |||||
| * | | | | | | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-11-19 | 26 | -5565/+5647 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| | * | | | | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-19 | 26 | -5565/+5647 | |
| | |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||||
| | | * | | | | | 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 | |||||
| | | * | | | | | Enable v2/v3 map tile url setting on robust as default in config | Justin Clark-Casey (justincc) | 2011-11-19 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary to see map tiles on v2/v3 viewers and appears to work fine | |||||
| | | * | | | | | 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 | |||||
| | | * | | | | | Replace HttpServer_OpenSim.dll with Oren Hurvitz's patch applied. | justincc | 2011-11-18 | 3 | -5456/+5453 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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! | |||||
| | | * | | | | | Turn the [RegionReady] module on by default and login_disable = true while ↵ | Justin Clark-Casey (justincc) | 2011-11-18 | 1 | -18/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | | * | | | | | Turn SellEnabled in the [EconomyModule] on by default. | Justin Clark-Casey (justincc) | 2011-11-17 | 2 | -15/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only provides enough functionality to allow operations for no money (e.g. sell for $0). | |||||
| | | * | | | | | Fix Windows build break | justincc | 2011-11-17 | 1 | -0/+3 | |
| | | | | | | | | ||||||
| | | * | | | | | 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. | |||||
| * | | | | | | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-11-17 | 30 | -592/+372 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| | * | | | | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 30 | -592/+372 | |
| | |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||||
| | | * | | | | | 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 | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |