aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Make atachment state load work againMelanie2013-08-021-1/+1
|
* Merge branch 'master' into careminsterMelanie2013-08-014-32/+105
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-08-012-15/+15
| |\
| | * * Thanks Plugh for pointing out that the constructor that takes a ulong ↵teravus2013-08-012-15/+15
| | | | | | | | | | | | regionhandle and saves it to to X,Y vars in the OpenSim.Framework.Location object was inverting the X and Y resulting in X and Y confusion. The test also used 256x256 in the uint,uint constructor so it was unable to determine if the X and Y components swapped. I don't expect much upheaval from this commit, not a lot of features were using the ulong Location object constructor. The database never stores the ulong regionhandle... the prims are loaded by region Guid. LLUDPServer used it to determine regions that it handled in a service definition where there was simply a X == X test which has the same logical result un-switched as it did switched. Again, thanks LibOMV for the regionhandle code.
| * | minor: Add name to debug lludp packet level feedback on consoleJustin Clark-Casey (justincc)2013-08-011-1/+1
| |/
| * Add experimental "debug attachments throttle <ms>" setting (command line) ↵Justin Clark-Casey (justincc)2013-08-011-15/+87
| | | | | | | | | | | | | | | | | | | | and ThrottlePer100PrimsRezzed in [Attachments] in config This is an experimental setting to control cpu spikes when an attachment heavy avatar logs in or avatars with medium attachments lgoin simultaneously. It inserts a ms sleep specified in terms of attachments prims after each rez when an avatar logs in. Default is 0 (no throttling). "debug attachments <level>" changes to "debug attachments log <level>" which controls logging. A logging level of 1 will show the throttling performed if applicable. Also adds "debug attachments status" command to show current throttle and debug logging levels.
| * Try a different approach to slow terrain update by always cycling the loop ↵Justin Clark-Casey (justincc)2013-08-011-1/+2
| | | | | | | | | | | | | | | | immediately if any data was sent, rather than waiting. What I believe is happening is that on initial terrain send, this is done one packet at a time. With WaitOne, the outbound loop has enough time to loop and wait again after the first packet before the second, leading to a slower send. This approach instead does not wait if a packet was just sent but instead loops again, which appears to lead to a quicker send without losing the cpu benefit of not continually looping when there is no outbound data.
| * Revert "Issue: painfully slow terrain loading. The cause is commit ↵Justin Clark-Casey (justincc)2013-08-011-5/+5
| | | | | | | | | | | | d9d995914c5fba00d4ccaf66b899384c8ea3d5eb (r/23185) -- the WaitOne on the UDPServer. Putting it back to how it was done solves the issue. But this may impact CPU usage, so I'm pushing it to test if it does." This reverts commit 59b461ac0eaae1cc34bb82431106fdf0476037f3.
| * Issue: painfully slow terrain loading. The cause is commit ↵Diva Canto2013-08-011-5/+5
| | | | | | | | d9d995914c5fba00d4ccaf66b899384c8ea3d5eb (r/23185) -- the WaitOne on the UDPServer. Putting it back to how it was done solves the issue. But this may impact CPU usage, so I'm pushing it to test if it does.
* | Merge branch 'master' into careminsterMelanie2013-08-0131-425/+1143
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
| * Experimental comment to eneralize the handling of Linden caps when theMic Bowman2013-07-313-1/+232
| | | | | | | | | | | | | | cap is something other than "localhost". A new interface for handling external caps is supported with an example implemented for Simian. The only linden cap supporting this interface right now is the GetTexture cap.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2013-07-311-1/+16
| |\
| | * HGWorldMapModule: unregister event on RemoveRegionDiva Canto2013-07-311-1/+10
| | |
| | * HGWorldMapModule: check whether it's enabled or not.Diva Canto2013-07-311-0/+6
| | |
| * | A pretty major restructuring of the simian method invocations in order toMic Bowman2013-07-3111-282/+578
| |/ | | | | | | | | | | | | service access capabilities. In conjunction with the corresponding Simian updates, this enables explicit per-simulator capability-based access to grid services. That enables grid owners to add or revoke access to the grid on a simulator by simulator basis.
| * Avoid another null ref opportunity.Diva Canto2013-07-301-1/+1
| |
| * Fix null ref.Diva Canto2013-07-301-1/+1
| |
| * Doing the HG Map / SimulatorFeatures "the right way": moved it to ↵Diva Canto2013-07-302-14/+48
| | | | | | | | | | | | | | HGMapModule, hooking on to SimulatorFeatures.OnSimulatorFeaturesRequest event (similar to what the DynamicMenuModule does). Only HG Visitors get this var, to avoid spamming local users. The config var is now called MapTileURL, to be consistent with the login one, and its being picked up from either [LoginService], [HGWorldMap] or [SimulatorFeatures], just because I have a bad memory.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-3010-92/+225
| |\
| | * BulletSim: distribute vehicle physical settings to all members ofRobert Adams2013-07-303-43/+61
| | | | | | | | | | | | | | | | | | a linkset. Enables constraint based linksets. Rename some internal variables to clarify whether values world or vehicle relative.
| | * BulletSim: test method for debugging of extended physics script operations.Robert Adams2013-07-301-8/+46
| | |
| | * BulletSim: make density display and return value consistant with howRobert Adams2013-07-303-8/+22
| | | | | | | | | | | | the simulator expects it (scaled to 100kg/m^3).
| | * minor: Add timeout secs to connection timeout message. Change message to ↵Justin Clark-Casey (justincc)2013-07-291-8/+9
| | | | | | | | | | | | reflect it is a timeout due to no data received rather than an ack issue.
| | * Fix issue just introduced in 8efe4bfc2ed7086e9fdf4812297e6525f955f6ac where ↵Justin Clark-Casey (justincc)2013-07-291-1/+1
| | | | | | | | | | | | I accidentally left in a test line to force very quick client unack
| | * Make "abnormal thread terminations" into "ClientLogoutsDueToNoReceives" and ↵Justin Clark-Casey (justincc)2013-07-293-27/+89
| | | | | | | | | | | | | | | | | | | | | add this to the StatsManager This reflects the actual use of this stat - it hasn't recorded general exceptions for some time. Make the sim extra stats collector draw the data from the stats manager rather than maintaing this data itself.
| * | After talking to lkalif on the IRC: SimulatorFeatures response: renamed the ↵Diva Canto2013-07-301-6/+7
| |/ | | | | | | | | | | OSDMap GridServices to OpenSimExtras, normalized the url keys under it, and moved ExportEnabled to under it too. Melanie: change your viewer code accordingly. Documentation at http://opensimulator.org/wiki/SimulatorFeatures_Extras
| * Groups: Better warning messages to the user.Diva Canto2013-07-282-3/+11
| |
| * Group chat: prevent a situation where dupe IMs could occur.Diva Canto2013-07-281-9/+3
| |
| * Group chat: guard against duplicate sendsDiva Canto2013-07-281-4/+5
| |
| * Changing the visibility test in groups service to be UUID.Zero.ToString() ↵Diva Canto2013-07-284-5/+9
| | | | | | | | instead of "all" because some paths in the code assume there's a UUI in the RequestingAgent string.
* | Merge branch 'master' into careminsterMelanie2013-07-2935-405/+836
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Same issue.Diva Canto2013-07-281-0/+1
| |
| * Same issue as previous commit.Diva Canto2013-07-282-14/+17
| |
| * Fix an issue where HG members of groups weren't seeing the entire membership ↵Diva Canto2013-07-281-2/+20
| | | | | | | | for group chat.
| * Removed commented lines and useless debug messageDiva Canto2013-07-282-17/+0
| |
| * Added BasicSearchModule.cs which handles OnDirFindQuery events. Removed that ↵Diva Canto2013-07-285-76/+212
| | | | | | | | handler from both Groups modules in core, and replaced them with an operation on IGroupsModule.
| * This makes people search work.Diva Canto2013-07-281-0/+41
| |
| * This makes group search work (Groups V2).Diva Canto2013-07-286-2/+88
| |
| * More on group chat: only root agents should subscribe to OnInstantMessage, ↵Diva Canto2013-07-271-1/+14
| | | | | | | | or else they'll see an echo of their own messages after teleporting.
| * More bug fixes on group chatDiva Canto2013-07-271-15/+19
| |
| * Several major improvements to group (V2) chat. Specifically: handle ↵Diva Canto2013-07-2711-196/+316
| | | | | | | | | | | | join/drop appropriately, invitechatboxes. The major departure from flotsam is to send only one message per destination region, as opposed to one message per group member. This reduces messaging considerably in large groups that have clusters of members in certain regions.
| * Increased the rate of the PollServiceRequestManager to 0.5 secs (it was ↵Diva Canto2013-07-261-1/+1
| | | | | | | | 1sec). Group chat is going over the EQ... Hopefully this won't increase CPU when there's nothing going on, but we need to watch for that.
| * Trying to decrease the lag on group chat. (Groups V2 only)Diva Canto2013-07-261-16/+24
| |
| * Commented out ChatSessionRequest capability in Vivox and Freeswitch. We ↵Diva Canto2013-07-262-18/+18
| | | | | | | | aren't processing it in any meaningful way, and it seems to get invoked everytime someone types a message in group chat.
| * Fix regression from 056a6ee7 because the RemoteSimulationConnector uses a ↵Justin Clark-Casey (justincc)2013-07-261-2/+5
| | | | | | | | copy of the LocalSimulationConnector but never initializes it (hence ServiceVersion was never set)
| * Fix failure in TestCreateDuplicateRootScenePresence().Justin Clark-Casey (justincc)2013-07-261-0/+13
| | | | | | | | | | This is a test setup failure since code paths when adding a duplicate root scene presence now require the EntityTransferModule to be present. Test fixed by adding this module to test setup
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-261-1/+1
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimnebadon2013-07-263-2/+5
| | |\
| | * | Force map tiler to save Water.jpg as an actual jpeg format it seems even ↵nebadon2013-07-261-1/+1
| | | | | | | | | | | | | | | | though we specified jpg extention it was actually a png and thus confusing the viewer silently.
| * | | Fix regression tests relating to agent transfer by making simulator use last ↵Justin Clark-Casey (justincc)2013-07-265-6/+39
| | |/ | |/| | | | | | | week's SIMULATOR/0.1 protocol for now.