aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-04-2926-686/+772
|\
| * Minor correction to yesterday's changes. Make normal prim crossing (no ↵Diva Canto2011-04-292-2/+3
| | | | | | | | attach) work well again.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-04-283-6/+14
| |\
| | * Stop CHANGED_INVENTORY firing twice if a notecard is edited in prim.Justin Clark-Casey (justincc)2011-04-283-6/+14
| | | | | | | | | | | | | | | | | | Addresses http://opensimulator.org/mantis/view.php?id=5444 Fix is to stop the asset transaction calling UpdateInventoryItem() since the caller is doing it anyway, which is more correct. This did not effect scripts.
| * | Fatpack message on agent transfers: 1 message only (UpdateAgent) containing ↵Diva Canto2011-04-288-138/+84
| | | | | | | | | | | | the agent and all attachments. Preserves backwards compatibility -- older sims get passed attachments one by one. Meaning that I finally introduced versioning in the simulation service.
| * | Eliminated sAgentCircuitData, a data structure that has been obsolete for ↵Diva Canto2011-04-281-1/+1
| |/ | | | | | | quite some time.
| * Fix a bug where physical objects rezzed with an initial velocity by script ↵Justin Clark-Casey (justincc)2011-04-281-0/+6
| | | | | | | | | | | | | | | | do not receive this velocity. This is a minimal fix for the 0.7.1 release, pending a non copy/paste solution. This hopefully addresses http://opensimulator.org/mantis/view.php?id=5457 The bug was introduced in commit 3ba5eeb
| * network traffic reduction - decrease update frequency for moving avatars ↵dahlia2011-04-261-10/+24
| | | | | | | | when velocity is unchanged
| * Add back the high prioritization for other avatars in theMic Bowman2011-04-261-6/+8
| | | | | | | | BestAvatarResponsiveness prioritizer.
| * Merge branch 'master' into queuetestMic Bowman2011-04-261-1/+9
| |\
| | * recover from unhandled exception from bad rotation data while processing ↵dahlia2011-04-251-1/+9
| | | | | | | | | | | | entity updates in LLClientView.cs
| * | Removed debug message in the token bucket codeMic Bowman2011-04-251-1/+1
| | |
| * | Fix the totals shown by show throttleMic Bowman2011-04-251-1/+1
| | |
| * | Merge branch 'master' into queuetestMic Bowman2011-04-252-11/+32
| |\ \ | | |/
| | * Made things consistent between LocalInventoryServiceConnector and ↵Diva Canto2011-04-252-11/+32
| | | | | | | | | | | | RemoteXInventoryServiceConnector on GetFolderContent.
| * | Fixed the transmission of throttles from root agent to childMic Bowman2011-04-253-34/+41
| | | | | | | | | | | | | | | | | | agents. Child throttles are based on the number of child agents known to the root and at least 1/4 of the throttle given to the root.
| * | Cleaned up various configuration options. Removed the category throttleMic Bowman2011-04-254-87/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | limits because the only ones used now are the defaults (which are overwritten by the client throttles anyway). Updated the default rates to correspond to about 350kbps. Also added a configuration to disable adaptive throttle. The default is the previous behavior (no adaptation).
| * | Merge branch 'master' into queuetestMic Bowman2011-04-2510-41/+109
| |\ \ | | |/
| | * Added MaxAgents configuration option to RegionConfig.ini allowing region ↵E. Allen Soard2011-04-231-1/+4
| | | | | | | | | | | | hosters to setup regions maintaining more control over system resources.
| | * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-04-212-0/+25
| | |\
| | | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-04-215-38/+78
| | | |\
| | | * | Implement agent limitsMelanie2011-04-212-0/+25
| | | | |
| | * | | fix merge conflicts with OpenSimDefaults.iniBlueWall2011-04-215-62/+163
| | |\ \ \ | | | | |/ | | | |/|
| | * | | some mesh config astheticsBlueWall2011-04-212-2/+2
| | | | |
| * | | | Added a second immediate queue to be used for the BestAvatar policyMic Bowman2011-04-221-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and currently used for all of an avatars attachments by the other policies. Also changed the way items are pulled from the update queues to bias close objects even more.
| * | | | Set the initial rate for the adaptive throttle to 160KpbsMic Bowman2011-04-221-4/+6
| | | | | | | | | | | | | | | | | | | | or about 15 packets per second.
| * | | | Various clean ups. Removed some debugging code. Added a new "show pqueues"Mic Bowman2011-04-223-25/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | command to look at the entity update priority queue. Added a "name" parameter to show queues, show pqueues and show throttles to look at data for a specific user.
| * | | | Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into ↵Mic Bowman2011-04-212-26/+34
| |\ \ \ \ | | | | | | | | | | | | | | | | | | queuetest
| | * | | | Refactor UnackedPacketCollection so ProcessQueues will handle Adds, Acks, ↵Dan Lake2011-04-212-26/+34
| | | | | | | | | | | | | | | | | | | | | | | | and Removes in that order.
| * | | | | Add some locking on the child list for the token bucketMic Bowman2011-04-211-15/+22
| |/ / / / | | | | | | | | | | | | | | | hiearchy. A few other cosmetic changes.
| * | | | Merge branch 'master' into queuetestMic Bowman2011-04-212-28/+90
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Added ability to remove unacked packet from UnackedPacketCollection without ↵Dan Lake2011-04-212-2/+38
| | | | | | | | | | | | | | | | | | | | an acknowledgement from the network. This prevents RTT and throttles from being updated as they would when an ACK is actually received. Also fixed stats logging for unacked bytes and resent packets in this case.
| * | | | bug fix. Now when an unacked update packet is handled through ↵Dan Lake2011-04-203-16/+25
| | | | | | | | | | | | | | | | | | | | ResendPrimUpdates, it is removed from the UnackedPacketCollection.
| * | | | Added an "immediate" queue to the priority queue. This isMic Bowman2011-04-202-247/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | per Melanie's very good suggestion. The immediate queue is serviced completely before all others, making it a very good place to put avatar updates & attachments. Moved the priority queue out of the LLUDP directory and into the framework. It is now a fairly general utility.
| * | | | Adds the first pass at an adaptive throttle to slow start newMic Bowman2011-04-204-18/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clients. If the sent packets are ack'ed successfully the throttle will open quickly up to the maximum specified by the client and/or the sims client throttle. This still needs a lot of adjustment to get the rates correct.
| * | | | Converted the property request queue to use the same retransmissionMic Bowman2011-04-191-23/+52
| | | | | | | | | | | | | | | | | | | | mechanism as the entity update queues.
| * | | | Requeue unacknowledged entity updates rather than resend then "as is".Dan Lake2011-04-193-54/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Often, by the time the UDPServer realizes that an entity update packet has not been acknowledged, there is a newer update for the same entity already queued up or there is a higher priority update that should be sent first. This patch eliminates 1:1 packet resends for unacked entity update packets. Insteawd, unacked update packets are decomposed into the original entity updates and those updates are placed back into the priority queues based on their new priority but the original update timestamp. This will generally place them at the head of the line to be put back on the wire as a new outgoing packet but prevents the resend queue from filling up with multiple stale updates for the same entity. This new approach takes advantage of the UDP nature of the Linden protocol in that the intent of a reliable update packet is that if it goes unacknowledge, SOMETHING has to happen to get the update to the client. We are simply making sure that we are resending current object state rather than stale object state. Additionally, this patch includes a generalized callback mechanism so that any caller can specify their own method to call when a packet expires without being acknowledged. We use this mechanism to requeue update packets and otherwise use the UDPServer default method of just putting expired packets in the resend queue.
* | | | | Fix crash when [Mesh] section is missing from configuration filesDan Lake2011-04-291-1/+2
| |_|_|/ |/| | |
* | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2011-04-215-62/+163
|\ \ \ \ | |_|_|/ |/| | |
| * | | Adjust freeswitch logging to be somewhat less noisy. However, there is ↵Justin Clark-Casey (justincc)2011-04-211-9/+18
| | | | | | | | | | | | | | | | still quite a large amount of logging present for debug purposes.
| * | | minor: small amount of method doc and some commented out odds and endsJustin Clark-Casey (justincc)2011-04-211-6/+15
| | | |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-04-211-3/+10
| |\ \ \ | | | |/ | | |/|
| | * | fix meshing failure on sculpt maps smaller than 64x64dahlia2011-04-191-3/+10
| | | |
| * | | Alter uuid gather so that it properly analyzes coalesced objects.Justin Clark-Casey (justincc)2011-04-212-22/+43
| |/ / | | | | | | | | | This should correct save all the assets required for the items within the coalesced objects in an IAR. This should also correctly gather the items on hypergrid takes.
| * | Get Viewer 2 voice working with OpenSim.Justin Clark-Casey (justincc)2011-04-201-13/+66
| | | | | | | | | | | | | | | | | | | | | | | | See http://opensimulator.org/mantis/view.php?id=5336 It turns out that viewer 2 was upset by the lack of a response to viv_watcher.php. This would send it into a continuous login loop. Viewer 1 was quite happy to ignore the lack of response. This commit puts in the bare minimum 'OK' message in response to viv_watcher.php. This allows viewer 2 voice to connect and appears to work. However, at some point we need to fill out the watcher response, whatever that is.
| * | Clean up freeswitch config to what is currently required. Add explanation ↵Justin Clark-Casey (justincc)2011-04-191-13/+15
| |/ | | | | | | to config parameters. Clean up some log messages.
* | Group collada meshies settings under [Mesh] in OpensimDefaults.iniBlueWall2011-04-211-1/+2
|/
* Move mesh on/off swtich from [Startup] to [Mesh] in anticipation of future ↵Justin Clark-Casey (justincc)2011-04-183-8/+12
| | | | | | | config parameters. Default remains true. OpenSimDefault.ini changed so if you haven't overriden this switch then you don't need to do anything.
* bump default IAR version to 0.2 and 1.1 for the --profile version.Justin Clark-Casey (justincc)2011-04-181-2/+2
| | | | There are no changes in this bump, they just signal a point at which the control file comes first in the archive.
* bump oar version number to 0.6.Justin Clark-Casey (justincc)2011-04-181-1/+1
| | | | This commit contains no data changes - the version bump is to establish a version at which the control file must come first in the archive.