Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-12-21 | 12 | -39/+15 |
|\ | |||||
| * | Remove unused SetAcceleration and add set on Acceleration parameter | Dan Lake | 2011-12-20 | 11 | -35/+14 |
| | | |||||
| * | Though the viewer warns about receiving this, not sending appears to break ↵ | Justin Clark-Casey (justincc) | 2011-12-20 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | | | | | | baked texture caching when crossing region boundaries. Needs further investigation. Revert "Stop sending the viewer its own AvatarAppearance packet." This reverts commit 92039f295d7fe66bf1a09b29483f9057e395839e. | ||||
* | | Moved an external test into the method that uses those preconditions. | Diva Canto | 2011-12-21 | 1 | -19/+11 |
| | | |||||
* | | HG: Verify that the user is local | Diva Canto | 2011-12-21 | 1 | -0/+8 |
|/ | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-12-20 | 21 | -282/+299 |
|\ | |||||
| * | Move HandleObjectGroupUpdate() from GroupsModule to Scene.PacketHandlers.cs ↵ | Justin Clark-Casey (justincc) | 2011-12-19 | 3 | -36/+44 |
| | | | | | | | | as this is updating SOG/SOP.GroupID, which is arguably generic. | ||||
| * | Stop sending the viewer its own AvatarAppearance packet. | Justin Clark-Casey (justincc) | 2011-12-19 | 1 | -1/+4 |
| | | | | | | | | | | The viewer warns in the log if it receives this. Stopping this doesn't appear to have adverse effects on viewer 1 or viewer 3 - the viewer gets its own appearance from body parts/clothes and self-baked textures. | ||||
| * | Stop unnecessarily sending the TextureEntry in client avatar updates. | Justin Clark-Casey (justincc) | 2011-12-19 | 1 | -1/+7 |
| | | | | | | | | | | | | As far as I know, viewers don't use this mechanism to recieve new TextureEntry data for avatars. This is done via the AvatarAppearance packet instead. Tested this back to viewer 1.23. Replacing with Utils.EmptyBytes since converting the texture entry to bytes on each AvatarUpdate (or which there are many) is not cost-free. | ||||
| * | Fix race condition where the appearance update timer could be stopped just ↵ | Justin Clark-Casey (justincc) | 2011-12-19 | 1 | -3/+6 |
| | | | | | | | | | | | | after another thread had started it on QueueAppearanceSave() or *Send() However, the window for this race is very small, and the next queued appearance save or send would restart the timer anyway. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-12-19 | 1 | -1/+1 |
| |\ | |||||
| | * | addresses mantis #5827 | nebadon | 2011-12-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | RAdmin - admin_save_oar fails if noassets parameter missing thanks Michelle Argus | ||||
| * | | Migrate detailed "appearance show" report generation up to ↵ | Justin Clark-Casey (justincc) | 2011-12-19 | 7 | -56/+90 |
| |/ | | | | | | | | | | | | | | | AvatarFactoryModule from AppearanceInfoModule so that it can be used in debug (inactive). Further filters "debug packet <level>" to exclused [Request]ObjectPropertiesFamily if level is below 25. Adjust some method doc Minor changes to some logging messages. | ||||
| * | Provide user feedback on execution of "backup" region console command | Justin Clark-Casey (justincc) | 2011-12-17 | 1 | -1/+2 |
| | | |||||
| * | Fix bug where objects couldn't be set back to the "none" group. | Justin Clark-Casey (justincc) | 2011-12-17 | 1 | -8/+13 |
| | | | | | | | | | | | | | | This is handled by treating UUID.Zero as a special case. Currently, asking for the "none" group returns nothing because XMLRPC groups, at least, is not properly handling this case. It may be better in the future to have GroupsModule return an appropriate GroupsData structure instead or require the underlying services to behave appropriately. This is a further component of http://opensimulator.org/mantis/view.php?id=5588 | ||||
| * | Fix bug where objects could not be set to a new group if the group had been ↵ | Justin Clark-Casey (justincc) | 2011-12-17 | 8 | -21/+50 |
| | | | | | | | | | | | | | | | | | | | | created in that client session, or if no other action has been performed on the object. There were two problems here: 1) On object group update, we looked for the group is the IClientAPI group cache rather than in the groups service. This fails to groups created newly in that session 2) On object group update, we weren't setting the HasGroupChanged flag. This meant that the change was not persisted unless some other action set this flag. This commit fixes these issues and hopefully addresses http://opensimulator.org/mantis/view.php?id=5588 This commit also moves HandleObjectGroupUpdate() to the GroupsModule from the Scene.PacketHandlers.cs file | ||||
| * | If a startup simulator script is present, run it after the normal region ↵ | Justin Clark-Casey (justincc) | 2011-12-17 | 1 | -12/+12 |
| | | | | | | | | | | | | | | selection code rather than before. This allows the script to change the selected region without having it immediately undone. Thanks to Garmin Kawaguichi for this patch. | ||||
| * | refactor: simplify methods in Scene.PacketHandlers.cs by using ↵ | Justin Clark-Casey (justincc) | 2011-12-17 | 2 | -142/+81 |
| | | | | | | | | GetGroupByPrim() rather than retrieving GetEntities() and inspecting the entire list | ||||
| * | Stop generating client flags when we send out full object updates. | Justin Clark-Casey (justincc) | 2011-12-16 | 4 | -27/+11 |
| | | | | | | | | These were entirely unused. | ||||
| * | Don't pass on ChaneWaterHeight event from EventManager is new water height ↵ | Justin Clark-Casey (justincc) | 2011-12-16 | 1 | -0/+6 |
| | | | | | | | | | | | | | | is less than 0 This is to stop bad values and subsequent viewer crashes. Thanks to Michelle Argus for this patch. | ||||
| * | Comment out accidentally left in "Adding physics prim" log message | Justin Clark-Casey (justincc) | 2011-12-16 | 1 | -1/+1 |
| | | |||||
| * | Tunnel [GroupsModule] DebugEnabled setting down into ↵ | Justin Clark-Casey (justincc) | 2011-12-16 | 2 | -11/+10 |
| | | | | | | | | XmlRpcGroupsServicesConnectorModule so that we can record cache misses | ||||
* | | Fixed bug of avie going under the terrain when crossing regions in certain ↵ | Diva Canto | 2011-12-20 | 1 | -2/+2 |
| | | | | | | | | directions. This was a 1-off bug: the terrain was being placed in 127, 127 resulting in a bounding box if -2, 256. I placed it in 128, 128 resulting in a bounding box of -1, 257. | ||||
* | | Changed the async approach on close child agents. This may improve crossings ↵ | Diva Canto | 2011-12-16 | 2 | -7/+7 |
| | | | | | | | | a little bit. | ||||
* | | Commented a couple of verbose debug messages. | Diva Canto | 2011-12-16 | 2 | -2/+2 |
|/ | |||||
* | Sends the consistent child agent position upon creation of the child agent ↵ | Diva Canto | 2011-12-16 | 1 | -1/+12 |
| | | | | in other regions, as opposed to <128, 128, 70> | ||||
* | No functional changes. Changed the prefix of that log message [CONNECTION ↵ | Diva Canto | 2011-12-16 | 2 | -15/+15 |
| | | | | | | BEGIN] to [SCENE] because that's where the message happens. Also changed the instantiation of a vector object to be done only once instead of every time we receive a position update. | ||||
* | HG minor bug fix and marked one method obsolete in UAS. | Diva Canto | 2011-12-16 | 3 | -1/+6 |
| | |||||
* | Stop pointlessly setting the m_colliderarr[] to false in the ODECharacter ↵ | Justin Clark-Casey (justincc) | 2011-12-15 | 1 | -5/+0 |
| | | | | constructor | ||||
* | Stop having to call SetHeight again in ScenePresence.AddToPhysicalScene() ↵ | Justin Clark-Casey (justincc) | 2011-12-15 | 4 | -24/+27 |
| | | | | | | when we've already passed size information to the avatar at PhysicsScene.AddAvatar() Eliminate some copypasta for height setting in OdeCharacter | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-12-15 | 1 | -1/+1 |
|\ | |||||
| * | minor fix to MegaRegions, typo spotted by Ubit! | nebadon | 2011-12-15 | 1 | -1/+1 |
| | | |||||
* | | Code cleanup related to ScenePresence.PhysicsActor and OdeScene/OdeCharacter | Justin Clark-Casey (justincc) | 2011-12-15 | 3 | -35/+56 |
|/ | | | | | | Stop hiding RemoveAvatar failure, add log messages when characters are removed through defects or re-added unexpectedly. Add commented out log lines for future use. Use automatic property for PhysicsActor for better code readability and simplicity | ||||
* | minor: add some currently commented log lines for use in debugging | Justin Clark-Casey (justincc) | 2011-12-14 | 1 | -1/+8 |
| | |||||
* | Simplify some manipulation of _taintedActors in OdeScene | Justin Clark-Casey (justincc) | 2011-12-14 | 1 | -13/+6 |
| | |||||
* | Eliminate _taintedPrimsH and _taintedPrimsL (and _taintedPrimLock) in favour ↵ | Justin Clark-Casey (justincc) | 2011-12-14 | 1 | -45/+14 |
| | | | | | | of just a _taintedPrims HashSet. There's no point maintaining a list because any pending taint operations are all carried out in the same call anyway. | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-12-14 | 2 | -11/+5 |
|\ | |||||
| * | Just adding a comment to SendFullUpdatToClient | Dan Lake | 2011-12-13 | 1 | -0/+2 |
| | | |||||
| * | Reorder clearing of upate schedule on SOP to before sending updates. Fix ↵ | Dan Lake | 2011-12-13 | 1 | -11/+3 |
| | | | | | | | | potential race condition. | ||||
* | | Fix off by one bug in objects GrabbingBehaviour of pCampBot.exe | Justin Clark-Casey (justincc) | 2011-12-14 | 2 | -2/+2 |
|/ | | | | Also fix usage message. | ||||
* | In AvatarFactoryModule.SetApperance(), perform ValidateBakedTextureCache() ↵ | Justin Clark-Casey (justincc) | 2011-12-13 | 2 | -4/+6 |
| | | | | | | | | in the same thread rather than on another one. The caller is already an async thread from LLClientView so this doesn't hold up the client. However, launching on a separate thread does remove the effect of m_setAppearanceLock This was potentially allowing two different SetAppearance threads to interfere with each other, though this probably rarely happens, if at all. | ||||
* | minor: remove pointless comment from OdeScene.cs | Justin Clark-Casey (justincc) | 2011-12-12 | 1 | -2/+1 |
| | |||||
* | Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and ↵ | Dan Lake | 2011-12-12 | 6 | -50/+57 |
| | | | | IsColliding | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-12-12 | 3 | -191/+72 |
|\ | |||||
| * | Mantis 5816: osParseJSON Decoding Problems | nebadon | 2011-12-11 | 3 | -191/+72 |
| | | | | | | | | | | | | | | osParseJSON uses hand-crafted decoding that has two issues * does not seem to handle top-level JSON lists * does not seem to handle unicode text thanks otakup0pe! | ||||
* | | Added an option for extra settings within region ini file. Any non-hardcoded ↵ | Dan Lake | 2011-12-12 | 1 | -20/+55 |
|/ | | | | key-value string pair can be added per-region and referenced by any part of OpenSim with access to the RegionInfo | ||||
* | Implement handler for TeleportCancel inbound packet | Melanie | 2011-12-10 | 5 | -0/+18 |
| | |||||
* | minor: remove a mono compiler warning | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -1/+1 |
| | |||||
* | Print out one log message for every missing baked texture, rather than two. | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -22/+4 |
| | |||||
* | minor: comment out "unpacked appearance" log mesasge for now | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -1/+1 |
| |