aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Util.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-211-58/+92
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * Refix the fixed fix!Melanie2012-03-211-2037/+2037
| |
| * Fixed borkness with previous merge.Diva Canto2012-03-201-16/+1
| |
| * Line endingsDiva Canto2012-03-201-89/+89
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-201-61/+89
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Util.cs
| * | HG Friends: allow the establishment of HG friendships without requiring ↵Diva Canto2012-03-201-1954/+1988
| | | | | | | | | | | | co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
* | | Merge branch 'master' into careminsterMelanie2012-03-201-2/+15
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Move frame loop entirely within Scene.Update() for better future performance ↵Justin Clark-Casey (justincc)2012-03-201-2/+15
| |/ | | | | | | | | | | | | | | analysis and stat accuracy. Update() now accepts a frames parameter which can control the number of frames updated. -1 will update until shutdown. The watchdog updating moves above the maintc recalculation for any required sleep since it should be accounted for within the frame.
* | Merge branch 'master' into careminsterMelanie2012-03-181-3/+60
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Improve threadpool reporting to "show threads" console command (also gets ↵Justin Clark-Casey (justincc)2012-03-161-1/+55
| | | | | | | | printed out periodically)
| * Add process working memory to "show stats" memory statistics.Justin Clark-Casey (justincc)2012-03-161-2/+5
| | | | | | | | This shows the actual amount of RAM being taken up by OpenSimulator (objects + vm overhead)
* | Merge branch 'master' into careminsterMelanie2012-02-211-0/+30
|\ \ | |/ | | | | Conflicts:
| * Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.Justin Clark-Casey (justincc)2012-02-211-0/+30
| |
* | Merge branch 'master' into careminsterMelanie2012-02-181-1/+37
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
| * On Windows automatically load the correct native ODE library depending on ↵Justin Clark-Casey (justincc)2012-02-181-1/+37
| | | | | | | | | | | | | | | | | | whether the process is 32-bit or 64-bit In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory. However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated. Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected. This will currently not work with sqlite - I will add that too if this works.
* | Merge branch 'master' into careminsterMelanie2012-02-101-2/+3
|\ \ | |/
| * Add line numbers to Util.PrintCallStack()Justin Clark-Casey (justincc)2012-02-101-2/+3
| |
* | Merge branch 'master' into bigmergeMelanie2011-12-091-16/+29
|\ \ | |/
| * Reactivate BasicCircuitTests.TestAddClient()Justin Clark-Casey (justincc)2011-12-081-16/+29
| | | | | | | | This checks that the initial UseCircuitCode packet is handled correctly for a normal client login.
* | Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmergeMelanie2011-10-251-3/+4
|\ \ | |/
| * Get UUIDGatherer to scan notecards in the graph for asset uuids.Justin Clark-Casey (justincc)2011-10-221-3/+4
| | | | | | | | | | This is to support npc baked texture saving in oars and iars. May address http://opensimulator.org/mantis/view.php?id=5743
* | Bring us up to date.Tom2011-09-141-2/+40
|\ \ | |/
| * In an object return message, send a null-terminated empty string in binary ↵Justin Clark-Casey (justincc)2011-09-131-2/+40
| | | | | | | | | | | | | | | | | | bucket to prevent a viewer 3 crash. This is the message sent to the client when the object is returned. We were sending byte[0] in the binary bucket. This didn't kill viewer 1 but did terminate viewer 3 (don't know about viewer 2). So sending "\0" instead. This is to address http://opensimulator.org/mantis/view.php?id=5683
* | Resolve merge commits, stage 1Tom2011-09-041-6/+34
|\ \ | |/
| * If a FireAndForget thread terminates with an exception, then catch and log ↵Justin Clark-Casey (justincc)2011-08-311-1/+15
| | | | | | | | | | | | rather than letting it terminate the simulator. Exceptions don't appear to do this with the SmartThreadPool but they do with UnsafeQueueUserWorkItem (and maybe others)
| * Add new FireAndForgetMethod.None.Justin Clark-Casey (justincc)2011-08-161-1/+10
| | | | | | | | This executes the callback on the same thread that made the request. Designed for use only by regression tests that rely on a predicable event ordering.
| * For all Util.FireAndForget invocations, set thread to en_US before ↵Justin Clark-Casey (justincc)2011-07-291-5/+10
| | | | | | | | | | | | | | | | | | | | continuing wtih the invocation. This is to avoid bugs where the locale is not manually set on the thread and bad data values get sent to the database or over the wire. Lots of code does this manually but as we've seen, a subtle change can hit code which has forgotton to do this. Since en_US show be used throughout the server at present, setting it at FireAndForget seems reasonable. Arguably, it would be better to do this where data is sent, but doing it here is much easier. All the manual BeginInvokes() remaining in the code should probably call FireAndForget instead.
* | Merge branch 'master' into careminster-presence-refactorroot2011-07-091-8/+33
|\ \ | |/
| * When loading library asset set, only store an asset if it's different from ↵Justin Clark-Casey (justincc)2011-07-081-3/+13
| | | | | | | | | | | | | | | | | | an existing one with the same id. We compare existing and loaded asset by doing an SHA1 on both, so that a changed library asset will still update the store. This cuts asset library load time from 10 seconds to <1 sec. Note, a fix on the previous commit revealed a bug where a library script cannot be copied except on the first login after a cache clear. This is unrelated to this commit and needs to be fixed at some subsequent time.
| * Fix interpretation of physics mesh proxies from mesh dataJustin Clark-Casey (justincc)2011-07-081-2/+17
| | | | | | | | | | | | | | | | As per http://wiki.secondlife.com/wiki/Mesh/Mesh_Asset_Format, some submesh blocks may just have the flag "NoGeometry" to signal that they provide no mesh data. If a block contains this, ignore it for meshing purposes rather than suffer a ClassCastException This fixes physics proxy meshing, so you can now walk through mesh doorways, properly stand on the trailer of mesh trucks, etc. To get mesh physics proxy, the UseMeshiesPhysicsMesh must be true in a [Mesh] config section in OpenSim.ini (example in OpenSimDefaults.ini). Convex hull physics not currently supported.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-091-0/+63
|\ \ | |/
| * More on HG Friends. Added Delete(string, string) across the board. Added ↵Diva Canto2011-05-221-2/+4
| | | | | | | | security to friendship identifiers so that they can safely be deleted across worlds. Had to change Get(string) to use LIKE because the secret in the identifier is not always known -- affects only HG visitors. BOTTOM LINE SO FAR: HG friendships established and deleted safely across grids, local rights working but not (yet?) being transmitted back.
| * HG Friends working to some extent: friendships offered and accepted ↵Diva Canto2011-05-191-0/+61
| | | | | | | | correctly handled. Friends list showing correct foreign names. TODO: GrantRights.
* | Merge branch 'queuetest' into careminster-presence-refactorMelanie2011-04-211-0/+17
|\ \ | |/
| * Requeue unacknowledged entity updates rather than resend then "as is".Dan Lake2011-04-191-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-241-3/+10
|\ \ | |/
| * Parameterizes the view distance used to compute and manageMic Bowman2011-02-221-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | child agents in neighbor regions. This means you can extend the view on a simulator beyond the default 3x3 regions. This uses a region default draw distance and should be replaced at some point by the avatar specified draw distance. That will require more careful, dynamic recomputation of child agents every time the draw distance changes. WARNING: this is experimental and has known instabilities. specifically all regions "within site" should be running the same default draw distance or agents will not be closed correctly.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-071-0/+10
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs OpenSim/Services/GridService/HypergridLinker.cs
| * Put something in the ImprovedInstantMessage.BinaryBucket for ↵Justin Clark-Casey (justincc)2011-02-041-0/+10
| | | | | | | | | | | | | | llInstantMessage() to stop this crashing viewer 2.4.0 (1.23.5 was fine with this). We're putting in a string of format "<region name><x pos floor int><y pos floor int><z pos floor int> which appears to be the expected value. This resolves http://opensimulator.org/mantis/view.php?id=5356
* | Revert my previous SHA1 commit in favour of a better implementationTom2011-01-261-3/+9
| |
* | Provide an SL compatible llMD5String function across all platformsTom2011-01-261-4/+10
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-131-3/+24
|\ \ | |/
| * Make FireAndForgetWrapper a singleton classBlueWall2011-01-131-3/+24
| | | | | | | | | | | | Made FireAndForgetWrapper a singleton class to allow us to drop dependancy on the BclExtras35 library. BclExtras is broken in Mono 2.8.2 and we used the library in only one function.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-031-0/+81
|\ \ | |/ | | | | Also prevent god takes from ending up in Lost and Found
| * Preservation of creator information now also working in IARs. Cleaned up ↵Diva Canto2010-11-291-0/+20
| | | | | | | | usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
| * Changed the parser for InventoryItem deserialization. Moved some utility ↵Diva Canto2010-11-271-0/+61
| | | | | | | | functions around.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-181-0/+8
|\ \ | |/
| * minor: add some method commentsJustin Clark-Casey (justincc)2010-11-171-0/+8
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-031-0/+11
|\ \ | |/
| * Port ExecutingDirectory from omfOS Util class.Melanie2010-10-031-0/+11
| |
generated by cgit v1.1 at 2024-11-20 16:18:29 +0000